activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r830393 [3/3] - in /activemq/sandbox/activemq-apollo: ./ activemq-all/ activemq-all/src/test/ide-resources/ activemq-all/src/test/java/org/apache/activemq/legacy/transport/ activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio...
Date Tue, 27 Oct 2009 23:14:44 GMT
Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/apollo/Combinator.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/apollo/Combinator.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/apollo/Combinator.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/apollo/Combinator.java
Tue Oct 27 23:14:41 2009
@@ -1,4 +1,22 @@
+/**
+ * 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.
+ */
 package org.apache.activemq.apollo;
+
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -10,6 +28,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Map.Entry;
 
 /**
@@ -17,15 +36,24 @@
  * This class is generally use in conjunction with TestNG test cases generate the @Factory
and @DataProvider 
  * results.
  * 
- * @author chirino
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 public class Combinator {
 
+    private Combinator parent;
+    private ArrayList<Combinator> children = new ArrayList<Combinator>();
+    
 	private LinkedHashMap<String, ComboOption> comboOptions = new LinkedHashMap<String,
ComboOption>();
 	private int annonymousAttributeCounter;
 	
+	public Combinator() {
+    }
+	
+    public Combinator(Combinator parent) {
+        this.parent = parent;
+    }
 
-	// For folks who like to use static imports to achieve a more fluent usage API.
+    // For folks who like to use static imports to achieve a more fluent usage API.
 	public static Combinator combinator() {
 		return new Combinator();
 	}
@@ -40,6 +68,20 @@
 		}
 	}
 
+	
+	public ArrayList<Combinator> all() {
+        ArrayList<Combinator> rc = new ArrayList<Combinator>();
+        root()._all(rc);
+        return rc;
+    }
+    
+	private void _all(ArrayList<Combinator> rc) {
+	    rc.add(this);
+        for (Combinator c : children) {
+            c._all(rc);
+        }	    
+	}
+	
 	public Combinator put(String attribute, Object... options) {
 		ComboOption co = this.comboOptions.get(attribute);
 		if (co == null) {
@@ -50,6 +92,13 @@
 		return this;
 	}
 	
+    public Combinator and() {
+        Combinator combinator = new Combinator(this);
+        children.add(combinator);
+        return combinator;
+    }
+
+	
 	public Combinator add(Object... options) {
 		put(""+(annonymousAttributeCounter++), options);
 		return this;
@@ -71,13 +120,29 @@
 //	}
 
 
-	public List<Map<String, Object>> combinations() {
-		List<Map<String, Object>> expandedOptions = new ArrayList<Map<String,
Object>>();
-		expandCombinations(new ArrayList<ComboOption>(comboOptions.values()), expandedOptions);
-		return expandedOptions;
-
+	public Set<Map<String, Object>> combinations() {
+	    return root()._combinations();
 	}
 
+    private Combinator root() {
+        Combinator c=this;
+        while( c.parent!=null ) {
+            c = c.parent;
+        }
+        return c;
+    }
+
+    private Set<Map<String, Object>> _combinations() {
+        LinkedHashSet<Map<String, Object>> rc = new LinkedHashSet<Map<String,
Object>>();
+        List<Map<String, Object>> expandedOptions = new ArrayList<Map<String,
Object>>();
+        expandCombinations(new ArrayList<ComboOption>(comboOptions.values()), expandedOptions);
+        rc.addAll(expandedOptions);
+        for (Combinator c : children) {
+            rc.addAll(c._combinations());
+        }
+		return rc;
+    }
+
 	private void expandCombinations(List<ComboOption> optionsLeft, List<Map<String,
Object>> expandedCombos) {
 		if (!optionsLeft.isEmpty()) {
 			Map<String, Object> map;
@@ -115,7 +180,7 @@
 	 * @throws IllegalAccessException
 	 */
 	public <T> Object[] combinationsAsBeans(Class<T> clazz) throws Exception {
-		List<Map<String, Object>> combinations = combinations();
+		Set<Map<String, Object>> combinations = combinations();
 		List<T> rc = new ArrayList<T>(combinations.size());
 		for (Map<String, Object> combination : combinations) {
 			T instance = clazz.newInstance();
@@ -152,8 +217,9 @@
 		return rc;
 	}
 	
-	public interface BeanFactory {
-		Object createBean() throws Exception;
+	public interface BeanFactory<T> {
+		T createBean() throws Exception;
+		Class<T> getBeanClass();
 	}
 	
 	public interface CombinationAware {
@@ -171,8 +237,8 @@
 	 * @throws InstantiationException
 	 * @throws IllegalAccessException
 	 */
-	public Object[] combinationsAsBeans(BeanFactory factory) throws Exception {
-		List<Map<String, Object>> combinations = combinations();
+	public <T> T[] asBeans(BeanFactory<T> factory) throws Exception {
+		Set<Map<String, Object>> combinations = combinations();
 		List<Object> rc = new ArrayList<Object>(combinations.size());
 		
 		Class<? extends Object> clazz=null;
@@ -199,11 +265,17 @@
 			}
 			rc.add(instance);
 		}
-		Object[] t = new Object[rc.size()];
+		
+		T[] t = toArray(factory, rc);
 		rc.toArray(t);
 		return t;
 	}
 
+    @SuppressWarnings("unchecked")
+    private <T> T[] toArray(BeanFactory<T> factory, List<Object> rc) {
+        return (T[]) Array.newInstance(factory.getBeanClass(), rc.size());
+    }
+
 	private void setField(Class<? extends Object> clazz, Object instance, String key,
Object value) throws NoSuchFieldException, IllegalAccessException {
 		while( clazz!= null ) {
 			try {
@@ -218,8 +290,8 @@
 		}
 	}
 
-	public <T> Object[][] combinationsAsParameterArgBeans(BeanFactory factory) throws
Exception {
-		Object[] x = combinationsAsBeans(factory);
+	public <T> Object[][] combinationsAsParameterArgBeans(BeanFactory<T> factory)
throws Exception {
+		Object[] x = asBeans(factory);
 		Object[][]rc = new Object[x.length][];
 		for (int i = 0; i < rc.length; i++) {
 			rc[i] = new Object[] {x[i]};
@@ -237,7 +309,7 @@
 	}
 
 	public Object[][] combinationsAsParameterArgs() {
-		List<Map<String, Object>> combinations = combinations();
+		Set<Map<String, Object>> combinations = combinations();
 		Object[][] rc = new Object[combinations.size()][];
 		int i=0;
 		for (Map<String, Object> combination : combinations) {
@@ -251,5 +323,4 @@
 		return rc;
 	}
 
-
 }

Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/BitArrayBinTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
Tue Oct 27 23:14:41 2009
@@ -1,8 +1,30 @@
+/**
+ * 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.
+ */
 package org.apache.activemq.util;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+import static org.junit.Assert.*;
+
+
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class BitArrayBinTest {
         
     @Test()
@@ -17,21 +39,21 @@
         BitArrayBin toTest = new BitArrayBin(window);
         
         for (int i=0; i <= dataSize; i++) {
-            Assert.assertTrue((!toTest.setBit(i, Boolean.TRUE)), "not already set");
+            assertTrue("not already set", (!toTest.setBit(i, Boolean.TRUE)));
         }
 
         int windowOfValidData = roundWindow(dataSize, window);
         int i=dataSize;
         for (; i >= dataSize -windowOfValidData; i--) {
-            Assert.assertTrue(toTest.setBit(i, Boolean.TRUE), ("was already set, id=" + i));
+            assertTrue(("was already set, id=" + i), toTest.setBit(i, Boolean.TRUE));
         }
         
         for (; i >= 0; i--) {
-            Assert.assertTrue((!toTest.setBit(i, Boolean.TRUE)), ("was not already set, id="
+ i));
+            assertTrue(("was not already set, id=" + i), (!toTest.setBit(i, Boolean.TRUE)));
         }
         
         for (int j= dataSize +1; j<(2*dataSize); j++) {
-            Assert.assertTrue((!toTest.setBit(j, Boolean.TRUE)), ("not already set: id="
+ j));
+            assertTrue(("not already set: id=" + j), (!toTest.setBit(j, Boolean.TRUE)));
         }
     }
     
@@ -47,20 +69,20 @@
         BitArrayBin toTest = new BitArrayBin(window);
         
         for (int i=0; i <=dataSize; i++) {
-            Assert.assertTrue((!toTest.setBit(i, Boolean.TRUE)), "not already set");
+            assertTrue("not already set", (!toTest.setBit(i, Boolean.TRUE)));
         }
                 
         int windowOfValidData = roundWindow(dataSize, window);
         for (int i=dataSize; i >= 0 && i >=dataSize -windowOfValidData; i--)
{
-            Assert.assertTrue(toTest.setBit(i, Boolean.FALSE), ("was already set, id=" +
i));
+            assertTrue(("was already set, id=" + i), toTest.setBit(i, Boolean.FALSE));
         }
 
         for (int i=0; i <=dataSize; i++) {
-            Assert.assertTrue((!toTest.setBit(i, Boolean.TRUE)), ("not already set, id:"
+ i));
+            assertTrue(("not already set, id:" + i), (!toTest.setBit(i, Boolean.TRUE)));
         }
 
         for (int j= 2*dataSize; j< 4*dataSize; j++) {
-            Assert.assertTrue((!toTest.setBit(j, Boolean.TRUE)), ("not already set: id="
+ j));
+            assertTrue(("not already set: id=" + j), (!toTest.setBit(j, Boolean.TRUE)));
         }
     }
     
@@ -73,8 +95,8 @@
                 BitArrayBin toTest = new BitArrayBin(window);
                 
                 int instance = value +muliplier*BitArray.LONG_SIZE;
-                Assert.assertTrue((!toTest.setBit(instance, Boolean.TRUE)), ("not already
set: id=" + instance));
-                Assert.assertTrue((!toTest.setBit(value, Boolean.TRUE)), ("not already set:
id=" + value));
+                assertTrue(("not already set: id=" + instance), (!toTest.setBit(instance,
Boolean.TRUE)));
+                assertTrue(("not already set: id=" + value), (!toTest.setBit(value, Boolean.TRUE)));
             }
         }
     }
@@ -89,13 +111,13 @@
         BitArrayBin toTest = new BitArrayBin(window);
         
         int instance = BitArray.LONG_SIZE;
-        Assert.assertTrue((!toTest.setBit(instance, Boolean.TRUE)), ("not already set: id="
+ instance));
+        assertTrue(("not already set: id=" + instance), (!toTest.setBit(instance, Boolean.TRUE)));
         
         instance = 12 *BitArray.LONG_SIZE;
-        Assert.assertTrue((!toTest.setBit(instance, Boolean.TRUE)), ("not already set: id="
+ instance));
+        assertTrue(("not already set: id=" + instance), (!toTest.setBit(instance, Boolean.TRUE)));
         
         instance = 9 *BitArray.LONG_SIZE;
-        Assert.assertTrue((!toTest.setBit(instance, Boolean.TRUE)), ("not already set: id="
+ instance));
+        assertTrue(("not already set: id=" + instance), (!toTest.setBit(instance, Boolean.TRUE)));
     }
     
     // window moves in increments of BitArray.LONG_SIZE.

Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
Tue Oct 27 23:14:41 2009
@@ -18,9 +18,13 @@
 
 import org.apache.activemq.util.buffer.DataByteArrayInputStream;
 import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+import static org.junit.Assert.*;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class DataByteArrayInputStreamTest {
 
     /**
@@ -49,6 +53,6 @@
         DataByteArrayInputStream in = new DataByteArrayInputStream(out.getData());
         in.readBoolean();
         String readBack = in.readUTF();
-        Assert.assertEquals(readBack, value);
+        assertEquals(value, readBack);
     }
 }

Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
Tue Oct 27 23:14:41 2009
@@ -19,8 +19,11 @@
 import java.io.IOException;
 
 import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class DataByteArrayOutputStreamTest {
 
     /**

Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
Tue Oct 27 23:14:41 2009
@@ -16,9 +16,13 @@
  */
 package org.apache.activemq.util;
 
-import org.junit.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+import static org.junit.Assert.*;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class ReflectionSupportTest {
 	
     String favoritesString = "[queue://test, topic://test]";
@@ -28,13 +32,13 @@
 	public void testSetBoolean() {
                   
         TestWitBoolean target = new TestWitBoolean();
-        Assert.assertTrue((!target.getKeepAlive()));
+        assertTrue((!target.getKeepAlive()));
 
         IntrospectionSupport.setProperty(target, "keepAlive", "TRUE");
-        Assert.assertTrue(target.getKeepAlive());
+        assertTrue(target.getKeepAlive());
         
         IntrospectionSupport.setProperty(target, "keepAlive", "false");
-        Assert.assertTrue((!target.getKeepAlive()));
+        assertTrue((!target.getKeepAlive()));
     }
 
     public static class TestWitBoolean {

Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/TreeMapTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/TreeMapTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/TreeMapTest.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/TreeMapTest.java
Tue Oct 27 23:14:41 2009
@@ -19,8 +19,10 @@
 import java.util.Comparator;
 import java.util.Iterator;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
 
 /**
  * @author cmacnaug
@@ -51,89 +53,89 @@
             refMap.put(keys[i], keys[i]);
         }
         
-        Assert.assertEquals(refMap.get(4), testMap.get(4));
-        Assert.assertEquals(refMap.get(3), testMap.get(3));
-        Assert.assertEquals(refMap.size(), testMap.size());
+        assertEquals(testMap.get(4), refMap.get(4));
+        assertEquals(testMap.get(3), refMap.get(3));
+        assertEquals(testMap.size(), refMap.size());
         
         //Test lookup:
-        Assert.assertEquals(testMap.lowerEntry(-2), null);
-        Assert.assertEquals(testMap.lowerEntry(-1), null);
-        Assert.assertEquals(testMap.lowerEntry(0), null);
-        Assert.assertEquals(testMap.lowerEntry(1).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.lowerEntry(2).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.floorEntry(49).getValue(), new Integer(48));
-        Assert.assertEquals(testMap.floorEntry(50).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.floorEntry(51).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.lowerEntry(198).getValue(), new Integer(196));
-        Assert.assertEquals(testMap.lowerEntry(199).getValue(), new Integer(198));
-        Assert.assertEquals(testMap.lowerEntry(200).getValue(), new Integer(198));
-        Assert.assertEquals(testMap.lowerEntry(201).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.lowerEntry(202).getValue(), new Integer(200));
-        
-        Assert.assertEquals(testMap.floorEntry(-2), null);
-        Assert.assertEquals(testMap.floorEntry(-1), null);
-        Assert.assertEquals(testMap.floorEntry(0).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.floorEntry(1).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.floorEntry(2).getValue(), new Integer(2));
-        Assert.assertEquals(testMap.floorEntry(49).getValue(), new Integer(48));
-        Assert.assertEquals(testMap.floorEntry(50).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.floorEntry(51).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.floorEntry(198).getValue(), new Integer(198));
-        Assert.assertEquals(testMap.floorEntry(199).getValue(), new Integer(198));
-        Assert.assertEquals(testMap.floorEntry(200).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.floorEntry(201).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.floorEntry(202).getValue(), new Integer(200));
-        
-        Assert.assertEquals(testMap.upperEntry(-2).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.upperEntry(-1).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.upperEntry(0).getValue(), new Integer(2));
-        Assert.assertEquals(testMap.upperEntry(1).getValue(), new Integer(2));
-        Assert.assertEquals(testMap.upperEntry(2).getValue(), new Integer(4));
-        Assert.assertEquals(testMap.upperEntry(49).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.upperEntry(50).getValue(), new Integer(52));
-        Assert.assertEquals(testMap.upperEntry(51).getValue(), new Integer(52));
-        Assert.assertEquals(testMap.upperEntry(198).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.upperEntry(199).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.upperEntry(200), null);
-        Assert.assertEquals(testMap.upperEntry(201), null);
-        Assert.assertEquals(testMap.upperEntry(202), null);
-        
-        Assert.assertEquals(testMap.ceilingEntry(-2).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.ceilingEntry(-1).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.ceilingEntry(0).getValue(), new Integer(0));
-        Assert.assertEquals(testMap.ceilingEntry(1).getValue(), new Integer(2));
-        Assert.assertEquals(testMap.ceilingEntry(2).getValue(), new Integer(2));
-        Assert.assertEquals(testMap.ceilingEntry(49).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.ceilingEntry(50).getValue(), new Integer(50));
-        Assert.assertEquals(testMap.ceilingEntry(51).getValue(), new Integer(52));
-        Assert.assertEquals(testMap.ceilingEntry(198).getValue(), new Integer(198));
-        Assert.assertEquals(testMap.ceilingEntry(199).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.ceilingEntry(200).getValue(), new Integer(200));
-        Assert.assertEquals(testMap.ceilingEntry(201), null);
-        Assert.assertEquals(testMap.ceilingEntry(202), null);
+        assertEquals(null, testMap.lowerEntry(-2));
+        assertEquals(null, testMap.lowerEntry(-1));
+        assertEquals(null, testMap.lowerEntry(0));
+        assertEquals(new Integer(0), testMap.lowerEntry(1).getValue());
+        assertEquals(new Integer(0), testMap.lowerEntry(2).getValue());
+        assertEquals(new Integer(48), testMap.floorEntry(49).getValue());
+        assertEquals(new Integer(50), testMap.floorEntry(50).getValue());
+        assertEquals(new Integer(50), testMap.floorEntry(51).getValue());
+        assertEquals(new Integer(196), testMap.lowerEntry(198).getValue());
+        assertEquals(new Integer(198), testMap.lowerEntry(199).getValue());
+        assertEquals(new Integer(198), testMap.lowerEntry(200).getValue());
+        assertEquals(new Integer(200), testMap.lowerEntry(201).getValue());
+        assertEquals(new Integer(200), testMap.lowerEntry(202).getValue());
+        
+        assertEquals(null, testMap.floorEntry(-2));
+        assertEquals(null, testMap.floorEntry(-1));
+        assertEquals(new Integer(0), testMap.floorEntry(0).getValue());
+        assertEquals(new Integer(0), testMap.floorEntry(1).getValue());
+        assertEquals(new Integer(2), testMap.floorEntry(2).getValue());
+        assertEquals(new Integer(48), testMap.floorEntry(49).getValue());
+        assertEquals(new Integer(50), testMap.floorEntry(50).getValue());
+        assertEquals(new Integer(50), testMap.floorEntry(51).getValue());
+        assertEquals(new Integer(198), testMap.floorEntry(198).getValue());
+        assertEquals(new Integer(198), testMap.floorEntry(199).getValue());
+        assertEquals(new Integer(200), testMap.floorEntry(200).getValue());
+        assertEquals(new Integer(200), testMap.floorEntry(201).getValue());
+        assertEquals(new Integer(200), testMap.floorEntry(202).getValue());
+        
+        assertEquals(new Integer(0), testMap.upperEntry(-2).getValue());
+        assertEquals(new Integer(0), testMap.upperEntry(-1).getValue());
+        assertEquals(new Integer(2), testMap.upperEntry(0).getValue());
+        assertEquals(new Integer(2), testMap.upperEntry(1).getValue());
+        assertEquals(new Integer(4), testMap.upperEntry(2).getValue());
+        assertEquals(new Integer(50), testMap.upperEntry(49).getValue());
+        assertEquals(new Integer(52), testMap.upperEntry(50).getValue());
+        assertEquals(new Integer(52), testMap.upperEntry(51).getValue());
+        assertEquals(new Integer(200), testMap.upperEntry(198).getValue());
+        assertEquals(new Integer(200), testMap.upperEntry(199).getValue());
+        assertEquals(null, testMap.upperEntry(200));
+        assertEquals(null, testMap.upperEntry(201));
+        assertEquals(null, testMap.upperEntry(202));
+        
+        assertEquals(new Integer(0), testMap.ceilingEntry(-2).getValue());
+        assertEquals(new Integer(0), testMap.ceilingEntry(-1).getValue());
+        assertEquals(new Integer(0), testMap.ceilingEntry(0).getValue());
+        assertEquals(new Integer(2), testMap.ceilingEntry(1).getValue());
+        assertEquals(new Integer(2), testMap.ceilingEntry(2).getValue());
+        assertEquals(new Integer(50), testMap.ceilingEntry(49).getValue());
+        assertEquals(new Integer(50), testMap.ceilingEntry(50).getValue());
+        assertEquals(new Integer(52), testMap.ceilingEntry(51).getValue());
+        assertEquals(new Integer(198), testMap.ceilingEntry(198).getValue());
+        assertEquals(new Integer(200), testMap.ceilingEntry(199).getValue());
+        assertEquals(new Integer(200), testMap.ceilingEntry(200).getValue());
+        assertEquals(null, testMap.ceilingEntry(201));
+        assertEquals(null, testMap.ceilingEntry(202));
         
         //Test iterators:
-        assertEquals(refMap.keySet().iterator(), testMap.keySet().iterator());
-        assertEquals(refMap.values().iterator(), testMap.values().iterator());
-        assertEquals(refMap.entrySet().iterator(), testMap.entrySet().iterator());
+        assertIteratorEquals(refMap.keySet().iterator(), testMap.keySet().iterator());
+        assertIteratorEquals(refMap.values().iterator(), testMap.values().iterator());
+        assertIteratorEquals(refMap.entrySet().iterator(), testMap.entrySet().iterator());
         
         //Test removal:
-        Assert.assertEquals(testMap.remove(testMap.firstKey()), refMap.remove(refMap.firstKey()));
+        assertEquals(refMap.remove(refMap.firstKey()), testMap.remove(testMap.firstKey()));
         Iterator<Integer> refIt = refMap.values().iterator();
         Iterator<Integer> testIt = testMap.values().iterator();
         refIt.next();
         testIt.next();
         refIt.remove();
         testIt.remove();
-        assertEquals(testIt, refIt);
+        assertIteratorEquals(testIt, refIt);
     }
     
-    private static <T> void assertEquals(Iterator<T> i1, Iterator<T> i2)
+    private static <T> void assertIteratorEquals(Iterator<T> i1, Iterator<T>
i2)
     {
-        Assert.assertEquals(i2.hasNext(), i1.hasNext());
+        assertEquals(i1.hasNext(), i2.hasNext());
         if(i1.hasNext())
         {
-            Assert.assertEquals(i2.next(), i1.next());
+            assertEquals(i1.next(), i2.next());
         }
     }
 }

Modified: activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/URISupportTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/URISupportTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/URISupportTest.java
(original)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/URISupportTest.java
Tue Oct 27 23:14:41 2009
@@ -21,43 +21,40 @@
 import java.util.Map;
 
 import org.apache.activemq.util.URISupport.CompositeData;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  *
- * @version $Revision: 1.1 $
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 public class URISupportTest {
     
     @Test()
 	public void testEmptyCompositePath() throws Exception {
         CompositeData data = URISupport.parseComposite(new URI("broker:()/localhost?persistent=false"));
-        Assert.assertEquals(data.getComponents().length, 0);        
+        assertEquals(0, data.getComponents().length);        
     }
             
     @Test()
 	public void testCompositePath() throws Exception {
         CompositeData data = URISupport.parseComposite(new URI("test:(path)/path"));
-        Assert.assertEquals(data.getPath(), "path");        
+        assertEquals("path", data.getPath());        
         data = URISupport.parseComposite(new URI("test:path"));
         assertNull(data.getPath());
     }
 
-    private void assertNull(Object path) {
-    	Assert.assertNull(path);
-	}
-
 	@Test()
 	public void testSimpleComposite() throws Exception {
         CompositeData data = URISupport.parseComposite(new URI("test:part1"));
-        Assert.assertEquals(data.getComponents().length, 1);
+        assertEquals(1, data.getComponents().length);
     }
 
     @Test()
 	public void testComposite() throws Exception {
         CompositeData data = URISupport.parseComposite(new URI("test:(part1://host,part2://(sub1://part,sube2:part))"));
-        Assert.assertEquals(data.getComponents().length, 2);
+        assertEquals(2, data.getComponents().length);
     }
 
     @Test()
@@ -66,17 +63,17 @@
         
         Map map = URISupport.parseParamters(source);
     
-        Assert.assertEquals(map.size(), 2, ("Size: " + map));
+        assertEquals(("Size: " + map), 2, map.size());
         assertMapKey(map, "cheese", "Edam");
         assertMapKey(map, "x", "123");
         
         URI result = URISupport.removeQuery(source);
         
-        Assert.assertEquals(result, new URI("tcp://localhost:61626/foo/bar"), "result");
+        assertEquals("result", new URI("tcp://localhost:61626/foo/bar"), result);
     }
     
     protected void assertMapKey(Map map, String key, Object expected) {
-        Assert.assertEquals(expected, map.get(key), ("Map key: " + key));
+        assertEquals(("Map key: " + key), map.get(key), expected);
     }
     
     @Test()
@@ -87,9 +84,9 @@
     @Test()
 	public void testCheckParenthesis() throws Exception {
         String str = "fred:(((ddd))";
-        Assert.assertFalse(URISupport.checkParenthesis(str));
+        assertFalse(URISupport.checkParenthesis(str));
         str += ")";
-        Assert.assertTrue(URISupport.checkParenthesis(str));
+        assertTrue(URISupport.checkParenthesis(str));
     }
     
 }

Added: activemq/sandbox/activemq-apollo/activemq-util/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-util/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-util/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-util/src/test/resources/log4j.properties Tue
Oct 27 23:14:41 2009
@@ -0,0 +1,35 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-util/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/log4j.properties
(added)
+++ activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/log4j.properties
Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/log4j.properties Tue Oct
27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/hawtdb/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/hawtdb/src/test/resources/log4j.properties?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/hawtdb/src/test/resources/log4j.properties (original)
+++ activemq/sandbox/activemq-apollo/hawtdb/src/test/resources/log4j.properties Tue Oct 27
23:14:41 2009
@@ -18,10 +18,18 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=WARN, console
-log4j.logger.org.apache.hawtdb=INFO
+log4j.rootLogger=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
 
-# CONSOLE appender not used by default
+# Console will only display warnnings
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Added: activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/log4j.properties Tue Oct
27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/kahadb/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/kahadb/src/test/resources/log4j.properties?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/kahadb/src/test/resources/log4j.properties (original)
+++ activemq/sandbox/activemq-apollo/kahadb/src/test/resources/log4j.properties Tue Oct 27
23:14:41 2009
@@ -18,19 +18,18 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
 
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.zookeeper=WARN
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
 
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/activemq-test.log
-log4j.appender.out.append=true
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Modified: activemq/sandbox/activemq-apollo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/pom.xml?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/pom.xml Tue Oct 27 23:14:41 2009
@@ -31,6 +31,7 @@
   <inceptionYear>2005</inceptionYear>
 
   <properties>
+    <target-dir>target</target-dir>
     <activemq-version>6.0-SNAPSHOT</activemq-version>
     <siteId>activemq-${activemq-version}</siteId>
     <projectName>Apache ActiveMQ</projectName>
@@ -64,8 +65,7 @@
     <jdom-version>1.0</jdom-version>
     <jetty-version>6.1.9</jetty-version>
     <jmock-version>1.0.1</jmock-version>
-    <junit-version>4.4</junit-version>
-    <testng-version>5.8</testng-version>
+    <junit-version>4.7</junit-version>
     <jxta-version>2.0</jxta-version>
     <log4j-version>1.2.14</log4j-version>
     <nlog4j-version>1.5.2</nlog4j-version>
@@ -630,20 +630,6 @@
         <version>${stax-version}</version>
       </dependency>
 
-      <!-- To use XPath using JAXP 1.3 (std in Java 5) -->
-      <dependency>
-        <groupId>activesoap</groupId>
-        <artifactId>jaxp-api</artifactId>
-        <version>1.3</version>
-      </dependency>
-
-      <!-- To use XPath using JAXP 1.2 (easier to add to Java 1.4.x) -->
-      <dependency>
-        <groupId>activesoap</groupId>
-        <artifactId>jaxp-api</artifactId>
-        <version>1.3</version>
-      </dependency>
-
       <dependency>
         <groupId>xalan</groupId>
         <artifactId>xalan</artifactId>
@@ -719,13 +705,6 @@
         <version>${junit-version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.testng</groupId>
-        <artifactId>testng</artifactId>
-        <version>${testng-version}</version>
-        <scope>test</scope>
-        <classifier>jdk15</classifier>
-      </dependency>
 
       <dependency>
         <groupId>jmock</groupId>
@@ -842,6 +821,11 @@
   </dependencyManagement>
 
   <build>
+  
+    <!-- to allow the eclipse profile to use a different target directory -->
+    <outputDirectory>${basedir}/${target-dir}/classes</outputDirectory>
+    <testOutputDirectory>${basedir}/${target-dir}/test-classes</testOutputDirectory>
+
     <pluginManagement>
       <plugins>
       <!-- 
@@ -893,7 +877,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            <redirectTestOutputToFile>false</redirectTestOutputToFile>
             <forkMode>once</forkMode>
             <argLine>-enableassertions</argLine>
             <failIfNoTests>false</failIfNoTests>
@@ -907,8 +891,10 @@
               <exclude>**/perf/**</exclude>
               <exclude>**/jaxb/**</exclude>
             </excludes>
+            <!--
             <parallel>methods</parallel>
             <threadCount>16</threadCount>
+            -->
           </configuration>
         </plugin>
         
@@ -1024,6 +1010,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
       </plugin>
       <!--
             <plugin>
@@ -1034,6 +1021,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.4.3</version>
       </plugin>
       <!--
             <plugin>
@@ -1052,6 +1040,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.3</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -1094,6 +1083,21 @@
   <profiles>
 
     <profile>
+      <id>eclipse</id>
+      <properties>
+        <target-dir>eclipse-classes</target-dir>
+      </properties>
+      <build>
+        <testResources>
+          <testResource>
+            <directory>${basedir}/src/test/ide-resources</directory>
+            <includes><include>**</include></includes>
+          </testResource>
+        </testResources>
+      </build>
+    </profile>
+
+    <profile>
       <id>graph</id>
       <pluginRepositories>
         <pluginRepository>



Mime
View raw message