james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ieu...@apache.org
Subject svn commit: r1347866 - in /james/mailbox/trunk: pom.xml spring/pom.xml spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml spring/src/test/resources/hbase-site.xml spring/src/test/resources/hdfs-site.xml
Date Fri, 08 Jun 2012 02:13:59 GMT
Author: ieugen
Date: Fri Jun  8 02:13:59 2012
New Revision: 1347866

URL: http://svn.apache.org/viewvc?rev=1347866&view=rev
Log:
MAILBOX-181 - fix spring-mailbox test for hbase-mailox

- seems to be a bug when starting Minicluster from spring-mailbox test  without a hbase-sites.xml
file - throws NPE
- removed log4j exclusion to avoid NoClassDefFound error

Added:
    james/mailbox/trunk/spring/src/test/resources/hbase-site.xml
Modified:
    james/mailbox/trunk/pom.xml
    james/mailbox/trunk/spring/pom.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
    james/mailbox/trunk/spring/src/test/resources/hdfs-site.xml

Modified: james/mailbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1347866&r1=1347865&r2=1347866&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Fri Jun  8 02:13:59 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file

Modified: james/mailbox/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/pom.xml?rev=1347866&r1=1347865&r2=1347866&view=diff
==============================================================================
--- james/mailbox/trunk/spring/pom.xml (original)
+++ james/mailbox/trunk/spring/pom.xml Fri Jun  8 02:13:59 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -156,9 +156,15 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
                 </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-core</artifactId>
+            <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>

Modified: james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml?rev=1347866&r1=1347865&r2=1347866&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
(original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
Fri Jun  8 02:13:59 2012
@@ -18,10 +18,10 @@
   under the License.    
 -->
 
-<beans xmlns="http://www.springframework.org/schema/beans" 
+<beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:amq="http://activemq.apache.org/schema/core" 
+       xmlns:amq="http://activemq.apache.org/schema/core"
        xsi:schemaLocation="
           http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
           http://camel.apache.org/schema/spring classpath:camel-spring.xsd
@@ -30,20 +30,20 @@
     <!-- 
       Mailbox Managers
      -->
-     
+
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-locker.xml" />
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-authenticator.xml"
/>
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-lucene.xml" />
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-jpa.xml" />
-<!-- 
+<!--
     JCR temporary desactivated because jackrabbit still uses lucene 2
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-jcr.xml" />
 -->
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-maildir.xml"
/>
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-memory.xml" />
-    <!--  
+
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-hbase.xml" />
-    -->
+
     <!-- 
       Mailbox Copier
      -->
@@ -57,5 +57,5 @@
       Group Membership Resolver
      -->
     <bean id="groupMembershipResolver" class="org.apache.james.mailbox.acl.SimpleGroupMembershipResolver"/>
-          
+
 </beans>

Added: james/mailbox/trunk/spring/src/test/resources/hbase-site.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/test/resources/hbase-site.xml?rev=1347866&view=auto
==============================================================================
--- james/mailbox/trunk/spring/src/test/resources/hbase-site.xml (added)
+++ james/mailbox/trunk/spring/src/test/resources/hbase-site.xml Fri Jun  8 02:13:59 2012
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Copyright 2011 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<configuration>
+<!--
+    This config file must be on the application classpath and will tell our application
+    where to find the HBase cluster.     
+-->
+    <property>
+        <name>hbase.rootdir</name>
+        <value>hdfs://localhost:9000/hbase</value>
+    </property>
+	
+    <property>
+        <name>hbase.master.port</name>
+        <value>60000</value>
+    </property>
+	
+    <property>
+        <name>hbase.regionserver.info.port</name>
+        <value>6030</value>
+    </property>
+
+    <property>
+        <name>hbase.regionserver.info.bindAddress</name>
+        <value>0.0.0.0</value>
+    </property>
+
+</configuration>

Modified: james/mailbox/trunk/spring/src/test/resources/hdfs-site.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/test/resources/hdfs-site.xml?rev=1347866&r1=1347865&r2=1347866&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/test/resources/hdfs-site.xml (original)
+++ james/mailbox/trunk/spring/src/test/resources/hdfs-site.xml Fri Jun  8 02:13:59 2012
@@ -3,31 +3,31 @@
 
 <configuration>
 
-<property>
-  <name>dfs.permissions</name>
-  <value>false</value>
-  <description>
-    If "true", enable permission checking in HDFS.
-    If "false", permission checking is turned off,
-    but all other behavior is unchanged.
-    Switching from one parameter value to the other does not change the mode,
-    owner or group of files or directories.
-  </description>
-</property>
+    <property>
+        <name>dfs.permissions</name>
+        <value>true</value>
+        <description>
+            If "true", enable permission checking in HDFS.
+            If "false", permission checking is turned off,
+            but all other behavior is unchanged.
+            Switching from one parameter value to the other does not change the mode,
+            owner or group of files or directories.
+        </description>
+    </property>
 
-<property>
-  <name>dfs.datanode.data.dir.perm</name>
-  <value>775</value>
-  <description>Permissions for the directories on on the local filesystem where
-  the DFS data node store its blocks. The permissions can either be octal or symbolic.
-  </description>
-</property>
+    <property>
+        <name>dfs.datanode.data.dir.perm</name>
+        <value>755</value>
+        <description>Permissions for the directories on on the local filesystem where
+            the DFS data node store its blocks. The permissions can either be octal or symbolic.
+        </description>
+    </property>
 
-<property>
-  <name>dfs.support.append</name>
-  <value>true</value>
-  <description>This branch of HDFS supports reliable append/sync.
-  </description>
-</property>
+    <property>
+        <name>dfs.support.append</name>
+        <value>true</value>
+        <description>This branch of HDFS supports reliable append/sync.
+        </description>
+    </property>
 
 </configuration>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message