Author: ieugen
Date: Tue Mar 20 08:37:21 2012
New Revision: 1302797
URL: http://svn.apache.org/viewvc?rev=1302797&view=rev
Log:
JAMES-1395
- all tests pass
Added:
james/server/trunk/data-hbase/src/main/resources/
Removed:
james/server/trunk/data-hbase/src/test/java/org/apache/james/JamesServerHBaseSuiteTest.java
james/server/trunk/data-hbase/src/test/resources/hdfs-site.xml
Modified:
james/server/trunk/data-hbase/pom.xml
james/server/trunk/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java
james/server/trunk/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
james/server/trunk/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
james/server/trunk/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java
james/server/trunk/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
Modified: james/server/trunk/data-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/pom.xml?rev=1302797&r1=1302796&r2=1302797&view=diff
==============================================================================
--- james/server/trunk/data-hbase/pom.xml (original)
+++ james/server/trunk/data-hbase/pom.xml Tue Mar 20 08:37:21 2012
@@ -168,9 +168,6 @@
<argLine>-Xms256m -Xmx512m</argLine>
<testFailureIgnore>false</testFailureIgnore>
<skip>false</skip>
- <includes>
- <include>**/*SuiteTest.java</include>
- </includes>
</configuration>
</plugin>
</plugins>
Modified:
james/server/trunk/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java?rev=1302797&r1=1302796&r2=1302797&view=diff
==============================================================================
---
james/server/trunk/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java
(original)
+++
james/server/trunk/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java
Tue Mar 20 08:37:21 2012
@@ -19,7 +19,6 @@
package org.apache.james.system.hbase;
import java.io.IOException;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -35,24 +34,24 @@ import org.apache.james.user.hbase.def.H
/**
* Table Pool singleton to get the DomainList, RecipientRewriteTable and
UserRepository HBase tables.
- *
+ *
* TODO Two getInstance methods are public, one for the impl, one for the
tests. This is not good.
*/
-public class TablePool {
-
+public class TablePool {
+
private static Configuration configuration;
private static TablePool hbaseSchema;
private static HTablePool htablePool;
-
+
/**
* Use getInstance to get an instance of the {@link HTablePool}.
- *
+ *
* Don't give any configuration, the default one will be used
* via {@link HBaseConfiguration#create(Configuration)}.
- *
+ *
* If you want to create the instance with a specific {@link
HBaseConfiguration},
* use {@link #getInstance(Configuration)}
- *
+ *
* @return An instance using a default configuration
* @throws IOException
*/
@@ -62,9 +61,9 @@ public class TablePool {
/**
* Use getInstance to get an instance of the {@link HTablePool}.
- *
+ *
* You can give at first call a specific {@link HBaseConfiguration} to
suit your needs.
- *
+ *
* @param configuration
* @return An instance of {@link HTablePool}
* @throws IOException
@@ -80,10 +79,10 @@ public class TablePool {
}
return hbaseSchema;
}
-
+
/**
* Get an instance of the {@link HDomainList} table.
- *
+ *
* @return An instance of {@link HDomainList}
*/
public HTable getDomainlistTable() {
@@ -92,7 +91,7 @@ public class TablePool {
/**
* Get an instance of the RecipientRewriteTable table.
- *
+ *
* @return An instance of {@link RecipientRewriteTable}
*/
public HTable getRecipientRewriteTable() {
@@ -101,7 +100,7 @@ public class TablePool {
/**
* Get an instance of the UsersRepository table.
- *
+ *
* @return An instance of {@link UsersRepository}
*/
public HTable getUsersRepositoryTable() {
@@ -110,20 +109,19 @@ public class TablePool {
/**
* Create a table if needed.
- *
+ *
* @param tableName
* @param columnFamilyName
* @throws IOException
*/
private static void ensureTable(byte[] tableName, byte[] columnFamilyName)
throws IOException {
HBaseAdmin hbaseAdmin = new HBaseAdmin(configuration);
- if (! hbaseAdmin.tableExists(tableName)) {
- HTableDescriptor desc = new HTableDescriptor(tableName);
- HColumnDescriptor hColumnDescriptor = new
HColumnDescriptor(columnFamilyName);
- hColumnDescriptor.setMaxVersions(1);
- desc.addFamily(hColumnDescriptor);
- hbaseAdmin.createTable(desc);
+ if (!hbaseAdmin.tableExists(tableName)) {
+ HTableDescriptor desc = new HTableDescriptor(tableName);
+ HColumnDescriptor hColumnDescriptor = new
HColumnDescriptor(columnFamilyName);
+ hColumnDescriptor.setMaxVersions(1);
+ desc.addFamily(hColumnDescriptor);
+ hbaseAdmin.createTable(desc);
}
}
-
}
Modified:
james/server/trunk/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java?rev=1302797&r1=1302796&r2=1302797&view=diff
==============================================================================
---
james/server/trunk/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
(original)
+++
james/server/trunk/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
Tue Mar 20 08:37:21 2012
@@ -18,18 +18,30 @@
****************************************************************/
package org.apache.james.domainlist.hbase;
+import java.io.IOException;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.lib.AbstractDomainListTest;
+import org.apache.james.mailbox.hbase.HBaseClusterSingleton;
+import org.apache.james.system.hbase.TablePool;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.slf4j.LoggerFactory;
/**
* Tests for the HBase DomainList implementation.
- *
+ *
* Simply create the needed HBaseDomainList instance, and let the
* AbstractDomainListTest run the tests
*/
public class HBaseDomainListTest extends AbstractDomainListTest {
+ private static HBaseClusterSingleton cluster =
HBaseClusterSingleton.build();
+
+ @BeforeClass
+ public static void setMeUp() throws IOException {
+ TablePool.getInstance(cluster.getConf());
+ }
+
/**
* @see
org.apache.james.domainlist.lib.AbstractDomainListTest#createDomainList()
*/
@@ -42,5 +54,4 @@ public class HBaseDomainListTest extends
domainList.setAutoDetectIP(false);
return domainList;
}
-
}
Modified:
james/server/trunk/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java?rev=1302797&r1=1302796&r2=1302797&view=diff
==============================================================================
---
james/server/trunk/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
(original)
+++
james/server/trunk/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
Tue Mar 20 08:37:21 2012
@@ -18,16 +18,20 @@
****************************************************************/
package org.apache.james.rrt.hbase;
+import java.io.IOException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.mailbox.hbase.HBaseClusterSingleton;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
+import org.apache.james.system.hbase.TablePool;
import org.apache.log4j.Logger;
+import org.junit.Before;
import org.slf4j.LoggerFactory;
/**
* Tests for the HBase RecipientRewriteTable implementation.
- *
+ *
* Simply create the needed HBaseRecipientRewriteTable instance, and let the
* AbstractRecipientRewriteTableTest run the tests.
*/
@@ -37,6 +41,12 @@ public class HBaseRecipientRewriteTableT
* The Logger.
*/
private static Logger logger =
Logger.getLogger(HBaseRecipientRewriteTableTest.class);
+ private static HBaseClusterSingleton cluster =
HBaseClusterSingleton.build();
+
+ @Before
+ public void setMeUp() throws IOException {
+ TablePool.getInstance(cluster.getConf());
+ }
/**
* @see
org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getRecipientRewriteTable()
Modified:
james/server/trunk/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java?rev=1302797&r1=1302796&r2=1302797&view=diff
==============================================================================
---
james/server/trunk/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java
(original)
+++
james/server/trunk/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java
Tue Mar 20 08:37:21 2012
@@ -19,9 +19,10 @@
package org.apache.james.system.hbase;
import java.io.IOException;
-
import junit.framework.Assert;
-
+import org.apache.james.mailbox.hbase.HBaseClusterSingleton;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -29,12 +30,19 @@ import org.junit.Test;
* Check that the returned singleton and table instances and not null.
*/
public class TablePoolTest {
-
+
+ private static HBaseClusterSingleton cluster =
HBaseClusterSingleton.build();
+
+ @BeforeClass
+ public static void setMeUp() throws IOException {
+ TablePool.getInstance(cluster.getConf());
+ }
+
@Test
public void testGetInstance() throws IOException {
Assert.assertNotNull(TablePool.getInstance());
}
-
+
@Test
public void testGetDomainlistTable() throws IOException {
Assert.assertNotNull(TablePool.getInstance().getDomainlistTable());
@@ -49,5 +57,4 @@ public class TablePoolTest {
public void testGetUsersRepositoryTable() throws IOException {
Assert.assertNotNull(TablePool.getInstance().getUsersRepositoryTable());
}
-
}
Modified:
james/server/trunk/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java?rev=1302797&r1=1302796&r2=1302797&view=diff
==============================================================================
---
james/server/trunk/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
(original)
+++
james/server/trunk/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
Tue Mar 20 08:37:21 2012
@@ -18,29 +18,41 @@
****************************************************************/
package org.apache.james.user.hbase;
+import java.io.IOException;
import java.util.Iterator;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.mailbox.hbase.HBaseClusterSingleton;
+import org.apache.james.system.hbase.TablePool;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.AbstractUsersRepositoryTest;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.slf4j.LoggerFactory;
/**
* Tests for the HBase UsersRepository implementation.
- *
+ *
* Simply create the needed HBaseUsersRepository instance, and let the
* AbstractUsersRepositoryTest run the tests
*/
public class HBaseUsersRepositoryTest extends AbstractUsersRepositoryTest {
+ private static HBaseClusterSingleton cluster =
HBaseClusterSingleton.build();
+
+ @BeforeClass
+ public static void setMeUp() throws IOException {
+ TablePool.getInstance(cluster.getConf());
+ }
+
/**
* @see org.apache.james.user.lib.AbstractUsersRepositoryTest#setUp()
*/
@Before
@Override
public void setUp() throws Exception {
+ super.setUp();
deleteAll();
}
@@ -55,7 +67,7 @@ public class HBaseUsersRepositoryTest ex
/**
* Delete all users in the repository. Used between each tests.
- *
+ *
* @throws UsersRepositoryException
* @throws Exception
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
