Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2195] trunk/archive-access/projects/ access-control
|
From: <al...@us...> - 2008-02-08 01:13:51
|
Revision: 2195
http://archive-access.svn.sourceforge.net/archive-access/?rev=2195&view=rev
Author: alexoz
Date: 2008-02-07 17:13:57 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
* HibernateRuleDao.java, DaoTestCase.java, HibernateRuleDaoTest.java
Moved to oracle project, so that we can drop the spring and hibernate dependencies for the client.
* pom.xml
Drop spring and hibernate dependencies in client library.
Modified Paths:
--------------
trunk/archive-access/projects/access-control/.settings/org.eclipse.jdt.core.prefs
trunk/archive-access/projects/access-control/access-control/pom.xml
trunk/archive-access/projects/access-control/oracle/pom.xml
Added Paths:
-----------
trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/
trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java
trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/
trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java
trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java
trunk/archive-access/projects/access-control/oracle/src/test/resources/
Removed Paths:
-------------
trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java
trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java
trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java
trunk/archive-access/projects/access-control/access-control/src/test/resources/
Modified: trunk/archive-access/projects/access-control/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/archive-access/projects/access-control/.settings/org.eclipse.jdt.core.prefs 2008-02-07 23:36:42 UTC (rev 2194)
+++ trunk/archive-access/projects/access-control/.settings/org.eclipse.jdt.core.prefs 2008-02-08 01:13:57 UTC (rev 2195)
@@ -1,4 +1,4 @@
-#Fri Feb 01 11:37:16 PST 2008
+#Thu Feb 07 15:35:49 PST 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
Modified: trunk/archive-access/projects/access-control/access-control/pom.xml
===================================================================
--- trunk/archive-access/projects/access-control/access-control/pom.xml 2008-02-07 23:36:42 UTC (rev 2194)
+++ trunk/archive-access/projects/access-control/access-control/pom.xml 2008-02-08 01:13:57 UTC (rev 2195)
@@ -14,13 +14,6 @@
</parent>
<build>
- <extensions>
- <extension>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -29,27 +22,7 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>hibernate3-maven-plugin</artifactId>
- <version>2.0-alpha-2</version>
- <configuration>
- <components>
- <component>
- <name>hbm2ddl</name>
- <implementation>jdbcconfiguration</implementation>
- </component>
- <component>
- <name>hbm2hbmxml</name>
- <outputDirectory>src/main/resources</outputDirectory>
- </component>
- </components>
- <componentProperties>
- <drop>true</drop>
- <configurationfile>/src/main/resources/hibernate.cfg.xml</configurationfile>
- </componentProperties>
- </configuration>
- </plugin>
+
</plugins>
</build>
<repositories>
@@ -71,37 +44,14 @@
</repository>
</repositories>
<dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
+
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
</dependency>
+
<dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- </dependency>
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2.2</version>
@@ -116,12 +66,8 @@
<artifactId>commons</artifactId>
<version>2.0.0-RC1</version>
</dependency>
+
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
- </dependency>
- <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
Deleted: trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java
===================================================================
--- trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java 2008-02-07 23:36:42 UTC (rev 2194)
+++ trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java 2008-02-08 01:13:57 UTC (rev 2195)
@@ -1,107 +0,0 @@
- package org.archive.accesscontrol.model;
-
-import java.util.List;
-
-import org.apache.commons.httpclient.URIException;
-import org.archive.surt.SURTTokenizer2;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-/**
- * The rule data access object provides convenience methods for using Hibernate
- * to access stored rules. The database connection is expected to be configured
- * using the SpringFramework ORM layer.
- *
- * @author aosborne
- */
-@SuppressWarnings("unchecked")
-public class HibernateRuleDao extends HibernateDaoSupport implements RuleDao {
- public Rule getRule(Long id) {
- return (Rule) getHibernateTemplate().get(Rule.class, id);
- }
-
- public List<Rule> getAllRules() {
- return getHibernateTemplate().find("from Rule");
- }
-
- public List<Rule> getRulesWithSurtPrefix(String prefix) {
- // escape wildcard characters % and _ using ! as the escape character.
- prefix = prefix.replace("!", "!!").replace("%", "!%")
- .replace("_", "!_");
- return getHibernateTemplate().find(
- "from Rule rule where rule.surt like ? escape '!'",
- prefix + "%");
- }
-
- public List<Rule> getRulesWithExactSurt(String surt) {
- return getHibernateTemplate().find(
- "from Rule rule where rule.surt = ?", surt);
- }
-
- /**
- * Returns the "rule tree" for a given SURT. This is a sorted set of all
- * rules equal or lower in specificity than the given SURT plus all rules on
- * the path from this SURT to the root SURT "(".
- *
- * The intention is to call this function with a domain or public suffix,
- * then queries within that domain can be made very fast by searching the
- * resulting list.
- *
- * @param surt
- * @return
- */
- public RuleSet getRuleTree(String surt) {
- RuleSet rules = new RuleSet();
-
- // add the root SURT
- rules.addAll(getRulesWithExactSurt("("));
-
- // now pull out all of the requested branch and a path to the root
- SURTTokenizer2 tok = SURTTokenizer2.newFromSURT(surt);
- while (true) {
- String search = tok.nextSearch();
- if (search == null) break;
-
- if (!search.endsWith(SURTTokenizer2.EXACT_SUFFIX)) {
- rules.addAll(getRulesWithExactSurt(search));
- } else {
- rules.addAll(getRulesWithSurtPrefix(search.substring(0, search.length() - 1)));
- tok.nextSearch(); // skip the duplicate exact-match
- }
- }
-
- return rules;
- }
-
- public void saveRule(Rule rule) {
- getHibernateTemplate().saveOrUpdate(rule);
- }
-
- /**
- * Save a rule and a change log entry in one go. (Uses a transaction).
- * @param rule
- * @param change
- */
- public void saveRule(Rule rule, RuleChange change) {
- Session session1 = getHibernateTemplate().getSessionFactory().openSession();
- Transaction tx = session1.beginTransaction();
- session1.saveOrUpdate(rule);
- session1.save(change);
- tx.commit();
- session1.close();
- }
-
- public void saveChange(RuleChange change) {
- getHibernateTemplate().saveOrUpdate(change);
- }
-
- public void deleteRule(Long id) {
- Object record = getHibernateTemplate().load(Rule.class, id);
- getHibernateTemplate().delete(record);
- }
-
- public void deleteAllRules() {
- getHibernateTemplate().bulkUpdate("delete from Rule");
- }
-}
Deleted: trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java
===================================================================
--- trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java 2008-02-07 23:36:42 UTC (rev 2194)
+++ trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java 2008-02-08 01:13:57 UTC (rev 2195)
@@ -1,16 +0,0 @@
-package org.archive.accesscontrol.model;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import junit.framework.TestCase;
-
-public abstract class DaoTestCase extends TestCase {
- protected ApplicationContext ctx = null;
-
- public DaoTestCase() {
- // Should put in a parent class that extends TestCase
- String[] paths = { "applicationContext.xml" };
- ctx = new ClassPathXmlApplicationContext(paths);
- }
-}
Deleted: trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java
===================================================================
--- trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java 2008-02-07 23:36:42 UTC (rev 2194)
+++ trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java 2008-02-08 01:13:57 UTC (rev 2195)
@@ -1,144 +0,0 @@
-package org.archive.accesscontrol.model;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-
-import org.archive.accesscontrol.model.HibernateRuleDao;
-import org.archive.accesscontrol.model.Rule;
-import org.archive.accesscontrol.model.RuleChange;
-
-import junit.framework.Assert;
-
-public class HibernateRuleDaoTest extends DaoTestCase {
- private Rule rule = null;
- private HibernateRuleDao dao = null;
-
-
- protected void setUp() throws Exception {
- super.setUp();
- dao = (HibernateRuleDao) ctx.getBean("ruleDao");
-
- // clear database of rules
- for (Rule rule: dao.getAllRules()) {
- try {
- dao.deleteRule(rule.getId());
- } catch (Exception e) {}
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- dao = null;
- }
-
- public void testSaveRecord() throws Exception {
- rule = new Rule();
- rule.setSurt("org,archive");
- rule.setWho("admins");
- dao.saveRule(rule);
- Assert.assertNotNull("primary key assigned", rule.getId());
- }
-
- public void testChange() throws Exception {
- RuleChange change = new RuleChange();
- change.setSurt("org,archive");
- change.setWho("admins");
- dao.saveChange(change);
- Assert.assertNotNull("primary key assigned", change.getId());
- }
-
- public void testSurtPrefixQuery() throws Exception {
- rule = new Rule();
- rule.setSurt("http://(org,archive,unique)/%%__/fish");
- dao.saveRule(rule);
-
- Rule rule2 = new Rule();
- rule2.setSurt("http://(org,archive,unique)/blasted/fish");
- dao.saveRule(rule2);
-
- List<Rule> rules = dao.getRulesWithSurtPrefix("http://(org,archive,unique)/%%__");
-
- Boolean foundRule1 = false;
- Boolean foundRule2 = false;
- for (Rule r: rules) {
- if (rule.getId().equals(r.getId())) {
- foundRule1 = true;
- }
- if (rule2.getId().equals(r.getId())) {
- foundRule2 = true;
- }
- }
- Assert.assertTrue("Should match rule 1", foundRule1);
- Assert.assertFalse("Should not match rule 2", foundRule2);
- }
-
- public void testExactSurtQuery() throws Exception {
- rule = new Rule();
- rule.setSurt("http://(org,archive,unique)/%%__/fish");
- dao.saveRule(rule);
-
- Rule rule2 = new Rule();
- rule2.setSurt("http://(org,archive,unique)/blasted/fish");
- dao.saveRule(rule2);
-
-
- List<Rule> rules = dao.getRulesWithExactSurt("http://(org,archive,unique)/%%__/fish");
-
- Boolean foundRule1 = false;
- Boolean foundRule2 = false;
- for (Rule r: rules) {
- if (rule.getId().equals(r.getId())) {
- foundRule1 = true;
- }
- if (rule2.getId().equals(r.getId())) {
- foundRule2 = true;
- }
- }
-
- Assert.assertTrue("Should match rule 1", foundRule1);
- Assert.assertFalse("Should not match rule 2", foundRule2);
- }
-
- public void testSurtTreeQuery() throws Exception {
- rule = new Rule();
- rule.setSurt("(org,archive,unique,)/secret");
- dao.saveRule(rule);
-
- Rule rule1 = new Rule();
- rule1.setSurt("(org,archive,unique,)/");
- dao.saveRule(rule1);
-
- Rule rule2 = new Rule();
- rule2.setSurt("(org,archive,unique");
- dao.saveRule(rule2);
-
- Rule rule3 = new Rule();
- rule3.setSurt("(org,archive");
- dao.saveRule(rule3);
-
- Rule rule4 = new Rule();
- rule4.setSurt("(");
- dao.saveRule(rule4);
-
- Rule rule5 = new Rule();
- rule5.setSurt("(org,archive,unique,)/other");
- dao.saveRule(rule5);
-
- Rule rule6 = new Rule();
- rule6.setSurt("(org,error,)/foobar");
- dao.saveRule(rule6);
-
- Iterable<Rule> rules = dao.getRuleTree("http://(org,archive,unique,)/");
-
- for (Rule r: rules) {
- assertTrue(r.getId().equals(rule.getId())
- || r.getId().equals(rule1.getId())
- || r.getId().equals(rule2.getId())
- || r.getId().equals(rule3.getId())
- || r.getId().equals(rule4.getId())
- || r.getId().equals(rule5.getId()));
- }
- }
-
-}
Modified: trunk/archive-access/projects/access-control/oracle/pom.xml
===================================================================
--- trunk/archive-access/projects/access-control/oracle/pom.xml 2008-02-07 23:36:42 UTC (rev 2194)
+++ trunk/archive-access/projects/access-control/oracle/pom.xml 2008-02-08 01:13:57 UTC (rev 2195)
@@ -112,6 +112,11 @@
<version>8.2-504.jdbc3</version>
</dependency>
<dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2.2</version>
Copied: trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java (from rev 2186, trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java)
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java (rev 0)
+++ trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java 2008-02-08 01:13:57 UTC (rev 2195)
@@ -0,0 +1,107 @@
+ package org.archive.accesscontrol.model;
+
+import java.util.List;
+
+import org.apache.commons.httpclient.URIException;
+import org.archive.surt.SURTTokenizer2;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+/**
+ * The rule data access object provides convenience methods for using Hibernate
+ * to access stored rules. The database connection is expected to be configured
+ * using the SpringFramework ORM layer.
+ *
+ * @author aosborne
+ */
+@SuppressWarnings("unchecked")
+public class HibernateRuleDao extends HibernateDaoSupport implements RuleDao {
+ public Rule getRule(Long id) {
+ return (Rule) getHibernateTemplate().get(Rule.class, id);
+ }
+
+ public List<Rule> getAllRules() {
+ return getHibernateTemplate().find("from Rule");
+ }
+
+ public List<Rule> getRulesWithSurtPrefix(String prefix) {
+ // escape wildcard characters % and _ using ! as the escape character.
+ prefix = prefix.replace("!", "!!").replace("%", "!%")
+ .replace("_", "!_");
+ return getHibernateTemplate().find(
+ "from Rule rule where rule.surt like ? escape '!'",
+ prefix + "%");
+ }
+
+ public List<Rule> getRulesWithExactSurt(String surt) {
+ return getHibernateTemplate().find(
+ "from Rule rule where rule.surt = ?", surt);
+ }
+
+ /**
+ * Returns the "rule tree" for a given SURT. This is a sorted set of all
+ * rules equal or lower in specificity than the given SURT plus all rules on
+ * the path from this SURT to the root SURT "(".
+ *
+ * The intention is to call this function with a domain or public suffix,
+ * then queries within that domain can be made very fast by searching the
+ * resulting list.
+ *
+ * @param surt
+ * @return
+ */
+ public RuleSet getRuleTree(String surt) {
+ RuleSet rules = new RuleSet();
+
+ // add the root SURT
+ rules.addAll(getRulesWithExactSurt("("));
+
+ // now pull out all of the requested branch and a path to the root
+ SURTTokenizer2 tok = SURTTokenizer2.newFromSURT(surt);
+ while (true) {
+ String search = tok.nextSearch();
+ if (search == null) break;
+
+ if (!search.endsWith(SURTTokenizer2.EXACT_SUFFIX)) {
+ rules.addAll(getRulesWithExactSurt(search));
+ } else {
+ rules.addAll(getRulesWithSurtPrefix(search.substring(0, search.length() - 1)));
+ tok.nextSearch(); // skip the duplicate exact-match
+ }
+ }
+
+ return rules;
+ }
+
+ public void saveRule(Rule rule) {
+ getHibernateTemplate().saveOrUpdate(rule);
+ }
+
+ /**
+ * Save a rule and a change log entry in one go. (Uses a transaction).
+ * @param rule
+ * @param change
+ */
+ public void saveRule(Rule rule, RuleChange change) {
+ Session session1 = getHibernateTemplate().getSessionFactory().openSession();
+ Transaction tx = session1.beginTransaction();
+ session1.saveOrUpdate(rule);
+ session1.save(change);
+ tx.commit();
+ session1.close();
+ }
+
+ public void saveChange(RuleChange change) {
+ getHibernateTemplate().saveOrUpdate(change);
+ }
+
+ public void deleteRule(Long id) {
+ Object record = getHibernateTemplate().load(Rule.class, id);
+ getHibernateTemplate().delete(record);
+ }
+
+ public void deleteAllRules() {
+ getHibernateTemplate().bulkUpdate("delete from Rule");
+ }
+}
Copied: trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java (from rev 2186, trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java)
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java (rev 0)
+++ trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/DaoTestCase.java 2008-02-08 01:13:57 UTC (rev 2195)
@@ -0,0 +1,16 @@
+package org.archive.accesscontrol.model;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import junit.framework.TestCase;
+
+public abstract class DaoTestCase extends TestCase {
+ protected ApplicationContext ctx = null;
+
+ public DaoTestCase() {
+ // Should put in a parent class that extends TestCase
+ String[] paths = { "applicationContext.xml" };
+ ctx = new ClassPathXmlApplicationContext(paths);
+ }
+}
Copied: trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java (from rev 2186, trunk/archive-access/projects/access-control/access-control/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java)
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java (rev 0)
+++ trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java 2008-02-08 01:13:57 UTC (rev 2195)
@@ -0,0 +1,144 @@
+package org.archive.accesscontrol.model;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.SortedSet;
+
+import org.archive.accesscontrol.model.HibernateRuleDao;
+import org.archive.accesscontrol.model.Rule;
+import org.archive.accesscontrol.model.RuleChange;
+
+import junit.framework.Assert;
+
+public class HibernateRuleDaoTest extends DaoTestCase {
+ private Rule rule = null;
+ private HibernateRuleDao dao = null;
+
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ dao = (HibernateRuleDao) ctx.getBean("ruleDao");
+
+ // clear database of rules
+ for (Rule rule: dao.getAllRules()) {
+ try {
+ dao.deleteRule(rule.getId());
+ } catch (Exception e) {}
+ }
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ dao = null;
+ }
+
+ public void testSaveRecord() throws Exception {
+ rule = new Rule();
+ rule.setSurt("org,archive");
+ rule.setWho("admins");
+ dao.saveRule(rule);
+ Assert.assertNotNull("primary key assigned", rule.getId());
+ }
+
+ public void testChange() throws Exception {
+ RuleChange change = new RuleChange();
+ change.setSurt("org,archive");
+ change.setWho("admins");
+ dao.saveChange(change);
+ Assert.assertNotNull("primary key assigned", change.getId());
+ }
+
+ public void testSurtPrefixQuery() throws Exception {
+ rule = new Rule();
+ rule.setSurt("http://(org,archive,unique)/%%__/fish");
+ dao.saveRule(rule);
+
+ Rule rule2 = new Rule();
+ rule2.setSurt("http://(org,archive,unique)/blasted/fish");
+ dao.saveRule(rule2);
+
+ List<Rule> rules = dao.getRulesWithSurtPrefix("http://(org,archive,unique)/%%__");
+
+ Boolean foundRule1 = false;
+ Boolean foundRule2 = false;
+ for (Rule r: rules) {
+ if (rule.getId().equals(r.getId())) {
+ foundRule1 = true;
+ }
+ if (rule2.getId().equals(r.getId())) {
+ foundRule2 = true;
+ }
+ }
+ Assert.assertTrue("Should match rule 1", foundRule1);
+ Assert.assertFalse("Should not match rule 2", foundRule2);
+ }
+
+ public void testExactSurtQuery() throws Exception {
+ rule = new Rule();
+ rule.setSurt("http://(org,archive,unique)/%%__/fish");
+ dao.saveRule(rule);
+
+ Rule rule2 = new Rule();
+ rule2.setSurt("http://(org,archive,unique)/blasted/fish");
+ dao.saveRule(rule2);
+
+
+ List<Rule> rules = dao.getRulesWithExactSurt("http://(org,archive,unique)/%%__/fish");
+
+ Boolean foundRule1 = false;
+ Boolean foundRule2 = false;
+ for (Rule r: rules) {
+ if (rule.getId().equals(r.getId())) {
+ foundRule1 = true;
+ }
+ if (rule2.getId().equals(r.getId())) {
+ foundRule2 = true;
+ }
+ }
+
+ Assert.assertTrue("Should match rule 1", foundRule1);
+ Assert.assertFalse("Should not match rule 2", foundRule2);
+ }
+
+ public void testSurtTreeQuery() throws Exception {
+ rule = new Rule();
+ rule.setSurt("(org,archive,unique,)/secret");
+ dao.saveRule(rule);
+
+ Rule rule1 = new Rule();
+ rule1.setSurt("(org,archive,unique,)/");
+ dao.saveRule(rule1);
+
+ Rule rule2 = new Rule();
+ rule2.setSurt("(org,archive,unique");
+ dao.saveRule(rule2);
+
+ Rule rule3 = new Rule();
+ rule3.setSurt("(org,archive");
+ dao.saveRule(rule3);
+
+ Rule rule4 = new Rule();
+ rule4.setSurt("(");
+ dao.saveRule(rule4);
+
+ Rule rule5 = new Rule();
+ rule5.setSurt("(org,archive,unique,)/other");
+ dao.saveRule(rule5);
+
+ Rule rule6 = new Rule();
+ rule6.setSurt("(org,error,)/foobar");
+ dao.saveRule(rule6);
+
+ Iterable<Rule> rules = dao.getRuleTree("http://(org,archive,unique,)/");
+
+ for (Rule r: rules) {
+ assertTrue(r.getId().equals(rule.getId())
+ || r.getId().equals(rule1.getId())
+ || r.getId().equals(rule2.getId())
+ || r.getId().equals(rule3.getId())
+ || r.getId().equals(rule4.getId())
+ || r.getId().equals(rule5.getId()));
+ }
+ }
+
+}
Copied: trunk/archive-access/projects/access-control/oracle/src/test/resources (from rev 2186, trunk/archive-access/projects/access-control/access-control/src/test/resources)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
