[jboss-svn-commits] JBL Code SVN: r37425 - in labs/jbossesb/branches/JBESB_4_10_CP/product: rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 18 14:06:00 EDT 2011
Author: tcunning
Date: 2011-08-18 14:06:00 -0400 (Thu, 18 Aug 2011)
New Revision: 37425
Modified:
labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListener.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCache.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheException.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListenerIntegrationTest.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheIntegrationTest.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheTestUtil.java
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/ftpfile_cache_test.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/services/base-project-build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/services/soapui-client/build.xml
Log:
JBESB-3475
Update the version of jboss cache used in JBoss ESB from 1.X to 3.2.7.
Also, remove the build/lib/ant-* JARs from all ant <junit/> tasks. Two
versions of junit was causing tests to be run multiple times and causing
errors.
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -32,8 +32,8 @@
<dependency org="org.hibernate" name="ejb3-persistence" rev="1.0.2.GA"/>
-->
<dependency org="hibernate-entitymanager" name="hibernate-entitymanager" rev="3.2.1.GA"/>
- <dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
- <dependency org="jgroups" name="jgroups" rev="2.4.1"/>
+ <dependency org="org.jboss.cache" name="jbosscache-core" rev="3.2.7.GA"/>
+ <dependency org="jgroups" name="jgroups" rev="2.6.15.GA"/>
<dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListener.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListener.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListener.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -22,12 +22,20 @@
package org.jboss.soa.esb.listeners.gateway.remotestrategies.cache;
import org.apache.log4j.Logger;
+import org.jboss.cache.Cache;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.TreeCacheListener;
import org.jgroups.View;
+import org.jboss.cache.notifications.annotation.CacheStarted;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeRemoved;
+import org.jboss.cache.notifications.annotation.CacheStopped;
+
+import org.jboss.cache.notifications.event.NodeRemovedEvent;
+import org.jboss.cache.notifications.event.CacheStartedEvent;
+import org.jboss.cache.notifications.event.CacheStoppedEvent;
+
/**
* This listener will upon node eviction events delete the
* node from the cache.
@@ -40,18 +48,19 @@
* @author <a href="daniel.bevenius at redpill.se">Daniel Bevenius</a>
*
*/
-public class DeleteOnEvictTreeCacheListener implements TreeCacheListener
+ at CacheListener
+public class DeleteOnEvictTreeCacheListener
{
- private Logger log = Logger .getLogger( DeleteOnEvictTreeCacheListener.class );
+ private Logger log = Logger.getLogger( DeleteOnEvictTreeCacheListener.class );
- private TreeCache treeCache;
+ private Cache cache;
- public DeleteOnEvictTreeCacheListener( final TreeCache treeCache )
+ public DeleteOnEvictTreeCacheListener( final Cache cache )
{
- if ( treeCache == null )
- throw new IllegalArgumentException( "treeCache must not be null" );
+ if ( cache == null )
+ throw new IllegalArgumentException( "cache must not be null" );
- this.treeCache = treeCache;
+ this.cache = cache;
}
@@ -59,11 +68,13 @@
* Will remove from the passed in fqn upon being
* evicted from the cache.
*/
- public void nodeEvicted( Fqn fqn )
+ @NodeRemoved
+ public void nodeEvicted(NodeRemovedEvent nre)
{
+ Fqn fqn = nre.getFqn();
try
{
- treeCache.remove( fqn );
+ cache.removeNode(fqn);
log.debug( "removed fqn : " + fqn );
}
catch (CacheException e)
@@ -71,14 +82,15 @@
log.error( "Exception while trying to remove data for fqn : " + fqn , e );
}
}
-
- public void cacheStarted(TreeCache arg0) {}
- public void cacheStopped(TreeCache arg0) {}
+
+ @CacheStarted
+ public void cacheStarted(CacheStartedEvent arg0) {}
+ @CacheStopped
+ public void cacheStopped(CacheStoppedEvent arg0) {}
public void nodeCreated(Fqn arg0) {}
public void nodeLoaded(Fqn arg0) {}
public void nodeModified(Fqn arg0) {}
public void nodeRemoved(Fqn arg0) {}
public void nodeVisited(Fqn arg0) {}
- public void viewChange(View arg0) {}
-
+ public void viewChange(View arg0) {}
}
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCache.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCache.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCache.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -8,13 +8,19 @@
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import org.apache.log4j.Logger;
+import org.jboss.cache.CacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.CacheException;
-import org.jboss.cache.PropertyConfigurator;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.TreeCacheListener;
+import org.jboss.cache.Cache;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.TreeCacheViewMBean;
import org.jboss.soa.esb.util.ClassUtil;
/**
@@ -46,9 +52,10 @@
*/
private String config;
/**
- * The JBoss TreeCache instance
+ * The JBoss Cache instance
*/
- private TreeCache treeCache;
+ private Cache cache;
+ private Node rootNode;
/**
*
@@ -65,10 +72,11 @@
InputStream in = null;
try
{
- treeCache = new TreeCache();
- in = getConfigInputStream( this.config );
- PropertyConfigurator configurator = new PropertyConfigurator();
- configurator.configure( treeCache, in );
+ in = getConfigInputStream( this.config );
+ CacheFactory factory = DefaultCacheFactory.getInstance();
+ cache = factory.createCache(in);
+
+ rootNode = cache.getRoot();
}
catch ( Exception e )
{
@@ -127,7 +135,7 @@
{
try
{
- treeCache.startService();
+ cache.start();
}
catch (Exception e)
{
@@ -142,7 +150,7 @@
*/
public void stop()
{
- treeCache.stopService();
+ cache.stop();
}
/**
@@ -153,7 +161,8 @@
*/
public void putFileName( final String fileName) throws CacheException
{
- treeCache.put ( fqn, fileName, fileName );
+ Fqn tempFqn = new Fqn (fqn);
+ cache.put(tempFqn, fileName, fileName );
}
/**
@@ -164,7 +173,8 @@
*/
public Object getFileName( final String fileName) throws CacheException
{
- return treeCache.get ( fqn, fileName );
+ Fqn tempFqn = new Fqn (fqn);
+ return cache.get(tempFqn,fileName);
}
/**
@@ -176,7 +186,9 @@
*/
public Object deleteFile( final String fileName ) throws CacheException
{
- return treeCache.remove( fqn, fileName );
+ Fqn tempFqn = new Fqn (fqn);
+
+ return cache.remove(tempFqn, fileName );
}
/**
@@ -187,7 +199,10 @@
*/
public boolean containsFile( final String fileName )
{
- return treeCache.exists( fqn, fileName );
+ Fqn tempFqn = new Fqn (fqn);
+
+ String value = (String) cache.get(tempFqn, fileName);
+ return (value != null);
}
/**
@@ -196,7 +211,14 @@
*/
public String getCache()
{
- return treeCache.print( fqn );
+ StringBuffer buffer = new StringBuffer();
+ Set<String> fileNames = cache.getKeys(fqn);
+ for (Iterator it=fileNames.iterator(); it.hasNext();) {
+ buffer.append((String) it.next());
+ buffer.append(" ");
+ // whatever
+ }
+ return buffer.toString();
}
public String getFqn()
@@ -222,23 +244,35 @@
*/
public void removeAll() throws CacheException
{
- treeCache.removeData( fqn );
+ Set<Node> nodes = cache.getRoot().getChildren();
+ Fqn tempFqn = new Fqn(fqn);
+ for (Iterator i = nodes.iterator(); i.hasNext();) {
+ Node n = (Node) i.next();
+ n.clearData();
+ cache.removeNode(n.getFqn());
+ cache.evict(n.getFqn(), true);
+ }
}
public void setDeleteOnEviction()
{
- treeCache.addTreeCacheListener( new DeleteOnEvictTreeCacheListener( treeCache) );
+ cache.addCacheListener( new DeleteOnEvictTreeCacheListener( cache) );
}
- public void addCacheListener( final TreeCacheListener listener )
+ public void addCacheListener( Object listener )
{
if ( listener != null )
- treeCache.addTreeCacheListener( listener );
+ cache.addCacheListener( listener );
}
public Map getCacheListeners()
- {
- return treeCache.getTreeCacheListeners();
+ {
+ Set listeners = cache.getCacheListeners();
+ Map resultMap = new Properties();
+ for (Iterator it=listeners.iterator(); it.hasNext();) {
+ resultMap.put(fqn, it.next());
+ }
+ return resultMap;
}
public void setCacheListener( final Class cacheListenerClass ) throws FtpFileCacheException
@@ -247,13 +281,9 @@
return;
try
{
- Constructor constructor = cacheListenerClass.getConstructor( TreeCache.class );
- Object object = constructor.newInstance( treeCache );
- if ( object instanceof TreeCacheListener )
- {
- TreeCacheListener listener = ( TreeCacheListener ) object;
- treeCache.addTreeCacheListener( listener );
- }
+ Constructor constructor = cacheListenerClass.getConstructor(Cache.class );
+ Object object = constructor.newInstance( cache );
+ cache.addCacheListener(object);
}
catch (SecurityException e)
{
@@ -305,7 +335,7 @@
public void destroy()
{
log.info( "destroy method of FtpFileCache called" );
- treeCache.destroy();
+ cache.destroy();
}
}
\ No newline at end of file
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheException.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheException.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheException.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -23,7 +23,8 @@
/**
*
- * @author <a href="daniel.bevenius at redpill.se">Daniel Bevenius</a>
+ * @author <a href="daniel.bevenius at redpill.se">Daniel Bevenius</a>
+ * @author <a href="tcunning at redhat.com">Tom Cunningham</a>
*
*/
public class FtpFileCacheException extends Exception
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -42,7 +42,10 @@
<fileset dir="${org.jboss.esb.lib.dir}" includes="jbossall-client-*.jar"/>
<fileset dir="${org.jboss.esb.lib.dir}" includes="jbossxb-2.0.0.GA.jar"/>
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.lib.dir}" includes="*.jar"/>
+ <fileset dir="${org.jboss.esb.lib.dir}">
+ <include name="*.jar"/>
+ <exclude name="ant-**"/>
+ </fileset>
<fileset dir="${org.jboss.esb.root.dir}/../testlib" includes="*.jar"/>
<fileset dir="${org.jboss.esb.ftp.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
@@ -311,6 +314,7 @@
<path refid="org.jboss.esb.tests.base.classpath"/>
</classpath>
<!-- emma jvm args -->
+ <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
<!--
Setting the endored lib to lib/ext/endorsed
@@ -346,6 +350,9 @@
</fileset>
</batchtest>
<classpath refid="org.jboss.esb.external.tests.classpath" />
+
+ <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
+
<!--
Setting the endored lib to lib/ext/endorsed
This was needed for Java6 as it distributes it's one version of saaj
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -47,6 +47,8 @@
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
import org.jboss.soa.esb.schedule.SchedulingException;
import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -61,14 +63,32 @@
{
@SuppressWarnings("unused")
- private Logger log = Logger .getLogger( ReadOnlyRemoteGatewayListenerIntegrationTest.class );
+ private static Logger log = Logger .getLogger( ReadOnlyRemoteGatewayListenerIntegrationTest.class );
+ private static Object server;
+
+ private static void registerHsqlDriver() {
+ try {
+ Class.forName( "org.hsqldb.jdbcDriver" );
+ } catch (Exception e) {
+ log.error(e);
+ }
+ }
+
@BeforeClass
public static void classSetup() throws EmbeddableException, ConfigurationException, GatewayException, RegistryException, MalformedURLException
{
MockCourierFactory.install();
MockRegistry.install();
MockRegistry.register(RemoteGatewayListenerUnitTest.SERVICE_CATEGORY, RemoteGatewayListenerUnitTest.SERVICE_NAME, new MockCourier(true));
+
+ registerHsqlDriver();
+ try {
+ server = HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "build" + File.separator + "hsqltestdb", "ftpcache");
+ } catch (Exception e) {
+ log.error(e);
+ server = null;
+ }
ftpServer = createFtpServer();
ftpServer.start();
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListenerIntegrationTest.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/DeleteOnEvictTreeCacheListenerIntegrationTest.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -28,10 +28,18 @@
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.Logger;
+import org.jboss.cache.CacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.Cache;
+
+import org.jboss.cache.notifications.event.Event;
+import org.jboss.cache.notifications.event.EventImpl;
+import org.jboss.cache.notifications.event.NodeRemovedEvent;
+import static org.jboss.cache.notifications.event.Event.Type.*;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,6 +49,7 @@
/**
*
* @author Daniel Bevenius
+ * @author Tom Cunningham
*
*/
public class DeleteOnEvictTreeCacheListenerIntegrationTest
@@ -49,43 +58,45 @@
private Logger log = Logger .getLogger( DeleteOnEvictTreeCacheListenerIntegrationTest.class );
private static DeleteOnEvictTreeCacheListener listener;
- private static TreeCache treeCache;
+ private static Cache cache;
private static final String FQN = "test/junit";
private String key = "testKey";
private String value = "testValue";
- private Fqn fqnTest = new Fqn ( new String[] { FQN, key, value} );
+ private Fqn fqnTest = new Fqn ( new Object[] { FQN, key, value} );
- @Test( expected=IllegalArgumentException.class )
- public void constructor()
- {
- new DeleteOnEvictTreeCacheListener( null );
- }
-
@Test
public void nodeEvict() throws CacheException
{
- treeCache.put( FQN, key, value );
- Node node = treeCache.get( fqnTest );
- assertTrue( "The value should have been added!", treeCache.exists( FQN, key ) );
+ Node rootNode = cache.getRoot();
+ Node testNode = rootNode.addChild(fqnTest);
+ testNode.put(key, value );
+ String getValue = (String) cache.get(fqnTest, key);
+ assertEquals( "The value should have been added!", getValue, value);
- listener.nodeEvicted( fqnTest );
- node = treeCache.get( fqnTest );
- assertFalse( "The value should have been removed upon eviction!", treeCache.exists( fqnTest ) );
+ EventImpl nre = new EventImpl();
+ nre.setFqn(fqnTest);
+ nre.setType(Event.Type.NODE_REMOVED);
+ listener.nodeEvicted(nre);
+ getValue = (String) cache.get( fqnTest, key);
+ assertFalse( "The value should have been removed upon eviction!", getValue != null);
- node = treeCache.get( fqnTest );
- assertNull ( "The node should have been removed from the cache store", node );
+ getValue = (String) cache.get( fqnTest, false );
+ assertNull ( "The node should have been removed from the cache store", getValue );
}
@Test
public void testCacheRestart() throws Exception
{
- treeCache.put( FQN, key, value );
- Object valueBeforeCacheShutdown = treeCache.get( FQN, key );
- treeCache.stop();
- treeCache.start();
- Object valueAfterCacheShutdown = treeCache.get( FQN, key );
- assertEquals( "Objects should be equal even after a treeCache restart", valueBeforeCacheShutdown, valueAfterCacheShutdown );
+ Node rootNode = cache.getRoot();
+ Node testNode = rootNode.addChild(fqnTest);
+ testNode.put(key, value );
+
+ Object valueBeforeCacheShutdown = cache.get( fqnTest, key );
+ cache.stop();
+ cache.start();
+ Object valueAfterCacheShutdown = cache.get( fqnTest, key );
+ assertTrue( "Objects should be cleared after shutdown", valueAfterCacheShutdown == null );
}
@BeforeClass
@@ -97,23 +108,27 @@
private static void startCache() throws Exception
{
- treeCache = new TreeCache();
- listener = new DeleteOnEvictTreeCacheListener( treeCache );
- treeCache.addTreeCacheListener( listener );
- FtpFileCacheTestUtil.createTreeCache( treeCache, FtpFileCacheTestUtil.getCacheConfigFile() );
- treeCache.start();
+ CacheFactory factory = DefaultCacheFactory.getInstance();
+ cache = factory.createCache();
+
+ listener = new DeleteOnEvictTreeCacheListener( cache );
+ cache.addCacheListener( listener );
+ FtpFileCacheTestUtil.createTreeCache( cache, FtpFileCacheTestUtil.getCacheConfigFile() );
+ cache.start();
}
private static void stopCache()
{
- treeCache.stop();
+ cache.stop();
+ cache.destroy();
}
@AfterClass
public static void classTearDown() throws Exception
{
- FtpFileCacheTestUtil.stopDB();
- stopCache();
+ stopCache();
+
+ FtpFileCacheTestUtil.stopDB();
}
public static junit.framework.Test suite()
@@ -121,36 +136,4 @@
return new JUnit4TestAdapter( DeleteOnEvictTreeCacheListenerIntegrationTest.class );
}
- @SuppressWarnings("unused")
- private int getMaxAgeSeconds()
- {
- int maxAgeSeconds = 0;
- NodeList elementsByTagName = treeCache.getEvictionPolicyConfig().getElementsByTagName( "region" );
- for ( int i = elementsByTagName.getLength() ; i-->0 ; )
- {
- org.w3c.dom.Node region = elementsByTagName.item( i );
- NamedNodeMap attributes = region.getAttributes();
- org.w3c.dom.Node fqnNameNode = attributes.getNamedItem( "name" );
- if ( fqnNameNode.getNodeValue().equals( "/ftp/cache" ))
- {
- NodeList childNodes = region.getChildNodes();
- for ( int y = 0 ; y < childNodes.getLength() ; y ++ )
- {
- org.w3c.dom.Node node = childNodes.item( y );
- if ( node.getNodeName().equals( "attribute" ))
- {
- NamedNodeMap attributes2 = node.getAttributes();
- org.w3c.dom.Node namedItem = attributes2.getNamedItem( "name" );
- if ( namedItem.getNodeValue().equals("maxAgeSeconds") )
- {
- maxAgeSeconds = Integer.valueOf( node.getTextContent() );
- break;
- }
- }
- }
- }
- }
- return maxAgeSeconds;
- }
-
}
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheIntegrationTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheIntegrationTest.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheIntegrationTest.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -21,6 +21,7 @@
* Test class FtpFileCache
*
* @author Daniel Bevenius
+ * @author Tom Cunningham
*
*/
public class FtpFileCacheIntegrationTest
@@ -91,8 +92,7 @@
String fileName = "testfile3";
ftpfileCache.putFileName( fileName );
ftpfileCache.removeAll();
- assertNull ( ftpfileCache.getFileName( fileName ));
-
+ assertNull ( ftpfileCache.getFileName( fileName ));
}
@BeforeClass
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheTestUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheTestUtil.java 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/FtpFileCacheTestUtil.java 2011-08-18 18:06:00 UTC (rev 37425)
@@ -25,9 +25,11 @@
import java.io.File;
-import org.jboss.cache.ConfigureException;
-import org.jboss.cache.PropertyConfigurator;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.CacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
+
+import org.jboss.cache.CacheException;
+import org.jboss.cache.Cache;
import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
@@ -64,29 +66,23 @@
return configFile;
}
- public static void createTreeCache( TreeCache treeCache, String pathToConfigFile ) throws ConfigureException
+ public static void createTreeCache( Cache cache, String pathToConfigFile ) throws CacheException
{
- PropertyConfigurator configurator = new PropertyConfigurator();
- configurator.configure( treeCache, pathToConfigFile );
+ CacheFactory factory = DefaultCacheFactory.getInstance();
+ cache = factory.createCache(pathToConfigFile);
}
- public static void startDB() throws Exception
- {
-
- registerHsqlDriver();
- server = HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "build" + File.separator + "hsqltestdb", "ftpcache");
+ public static void startDB() throws Exception {
+ registerHsqlDriver();
+ server = HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "build" + File.separator + "hsqltestdb", "ftpcache");
}
- private static void registerHsqlDriver()
- {
- try
- {
- Class.forName( "org.hsqldb.jdbcDriver" );
- }
- catch (Exception e)
- {
- fail( "ERROR: failed to load JDBC driver." + e.getMessage() );
- }
+ private static void registerHsqlDriver() {
+ try {
+ Class.forName( "org.hsqldb.jdbcDriver" );
+ } catch (Exception e) {
+ fail( "ERROR: failed to load JDBC driver." + e.getMessage() );
+ }
}
public static void stopDB() throws Exception
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/ftpfile_cache_test.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/ftpfile_cache_test.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/remotestrategies/cache/ftpfile_cache_test.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -1,147 +1,367 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This file is a copy of the one in core/listeners/test/resources/etc and only here
- to test the ability to specify a configuration file relative to the classes classpath.
--->
-<server>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
- <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+ <!--
- <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=TreeCache">
+ isolation levels supported: READ_COMMITTED and REPEATABLE_READ
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
+ nodeLockingSchemes: mvcc, pessimistic (deprecated), optimistic (deprecated)
- <!-- Configure the TransactionManager -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.DummyTransactionManagerLookup</attribute>
+ -->
- <!-- Isolation level : SERIALIZABLE REPEATABLE_READ (default) READ_COMMITTED READ_UNCOMMITTED NONE -->
- <!--attribute name="IsolationLevel">REPEATABLE_READ</attribute-->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+ <locking
- <!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->
- <attribute name="CacheMode">REPL_SYNC</attribute>
+ isolationLevel="REPEATABLE_READ"
- <!-- Just used for async repl: use a replication queue -->
- <attribute name="UseReplQueue">false</attribute>
+ lockParentForChildInsertRemove="false"
- <!-- Replication interval for replication queue (in ms) -->
- <attribute name="ReplQueueInterval">0</attribute>
+ lockAcquisitionTimeout="20000"
- <!-- Max number of elements which trigger replication -->
- <attribute name="ReplQueueMaxElements">0</attribute>
+ nodeLockingScheme="mvcc"
- <!-- Name of cluster. Needs to be the same for all clusters, in order to find each other -->
- <attribute name="ClusterName">FtpFileCache-Cluster</attribute>
+ writeSkewCheck="false"
- <attribute name="ClusterConfig">
- <config>
- <UDP mcast_addr="228.5.5.5" mcast_port="48866"
- bind_addr="localhost"
- receive_on_all_interfaces="true"
- send_on_all_interfaces="true"
- enable_diagnostics="false"
- ip_ttl="64" ip_mcast="false"
- mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
- ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
- loopback="true"/>
- <PING timeout="2000" up_thread="false" down_thread="false"/>
- <MERGE2 min_interval="10000" max_interval="20000"/>
- <FD shun="false" up_thread="true" down_thread="true" />
- <FD_SIMPLE/>
- <VERIFY_SUSPECT timeout="1500" up_thread="false" down_thread="false"/>
- <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800" max_xmit_size="8192" up_thread="false" down_thread="false"/>
- <UNICAST timeout="600,1200,2400" down_thread="false"/>
- <pbcast.STABLE desired_avg_gossip="20000" up_thread="false" down_thread="false"/>
- <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
- <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" shun="true" print_local_addr="true"/>
- <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
- </config>
- </attribute>
+ useLockStriping="true"
- <!-- Whether or not to fetch state on joining a cluster -->
- <attribute name="FetchStateOnStartup">true</attribute>
+ concurrencyLevel="500"/>
- <!--
- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="InitialStateRetrievalTimeout">10000</attribute>
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">10000</attribute>
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
+ <!--
+ Used to register a transaction manager and participate in ongoing transactions.
- <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">30</attribute>
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </region>
- <region name="/ftp/cache">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- <attribute name="maxAgeSeconds">86400</attribute>
- </region>
- </config>
- </attribute>
-
- <attribute name="CacheLoaderConfiguration">
- <config>
- <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
- <passivation>true</passivation>
-
- <!-- comma delimited FQNs to preload -->
- <preload>/ftp/cache</preload>
-
- <!-- are the cache loaders shared in a cluster? -->
- <shared>false</shared>
-
- <!-- we can now have multiple cache loaders, which get chained -->
- <!-- the 'cacheloader' element may be repeated -->
- <cacheloader>
- <class>org.jboss.cache.loader.JDBCCacheLoader</class>
- <properties>
- cache.jdbc.driver=org.hsqldb.jdbcDriver
- cache.jdbc.url=jdbc:hsqldb:hsql://localhost:9001/ftpcache
- cache.jdbc.user=sa
- cache.jdbc.password=
- </properties>
- <!-- whether the cache loader writes are asynchronous -->
- <async>false</async>
-
- <!-- only one cache loader in the chain may set fetchPersistentState to true.
- An exception is thrown if more than one cache loader sets this to true. -->
- <fetchPersistentState>false</fetchPersistentState>
-
- <!-- determines whether this cache loader ignores writes - defaults to false. -->
- <ignoreModifications>false</ignoreModifications>
-
- <!-- if set to true, purges the contents of this cache loader when the cache starts u Defaults to false. -->
- <purgeOnStartup>false</purgeOnStartup>
-
- </cacheloader>
- </config>
- </attribute>
-
- </mbean>
+ -->
+ <transaction
- <!-- Uncomment to get a graphical view of the TreeCache MBean above -->
- <!-- <mbean code="org.jboss.cache.TreeCacheView" name="jboss.cache:service=TreeCacheView">-->
- <!-- <depends>jboss.cache:service=TreeCache</depends>-->
- <!-- <attribute name="CacheService">jboss.cache:service=TreeCache</attribute>-->
- <!-- </mbean>-->
+ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
-</server>
+ syncCommitPhase="false"/>
+
+
+
+ <!--
+
+ Used to register JMX statistics in any available MBean server
+
+ -->
+
+ <jmxStatistics
+
+ enabled="false"/>
+
+
+
+ <!--
+
+ If region based marshalling is used, defines whether new regions are inactive on startup.
+
+ -->
+
+ <startup
+
+ regionsInactiveOnStartup="true"/>
+
+
+
+ <!--
+
+ Used to register JVM shutdown hooks.
+
+ hookBehavior: DEFAULT, REGISTER, DONT_REGISTER
+
+ -->
+
+ <shutdown
+
+ hookBehavior="DEFAULT"/>
+
+
+
+ <!--
+
+ Used to define async listener notification thread pool size
+
+ -->
+
+ <listeners
+
+ asyncPoolSize="1"
+
+ asyncQueueSize="100000"/>
+
+
+
+ <!--
+
+ Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
+
+ -->
+
+ <invocationBatching
+
+ enabled="false"/>
+
+
+
+ <!--
+
+ serialization related configuration, used for replication and cache loading
+
+ -->
+
+ <serialization
+
+ objectInputStreamPoolSize="12"
+
+ objectOutputStreamPoolSize="14"
+
+ version="3.0.0"
+
+ marshallerClass="org.jboss.cache.marshall.CacheMarshaller200"
+
+ useLazyDeserialization="false"
+
+ useRegionBasedMarshalling="false"/>
+
+
+
+ <!--
+
+ This element specifies that the cache is clustered.
+
+ modes supported: replication (r) or invalidation (i).
+
+ -->
+
+ <clustering mode="replication" clusterName="JBossCache-cluster">
+
+
+
+ <!--
+
+ Defines whether to retrieve state on startup
+
+ -->
+
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+
+
+
+ <!--
+
+ Network calls are synchronous.
+
+ -->
+
+ <sync replTimeout="20000"/>
+
+ <!--
+
+ Uncomment this for async replication.
+
+ -->
+
+ <!--<async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500" serializationExecutorPoolSize="20" serializationExecutorQueueSize="5000000"/>-->
+
+
+
+ <!-- Uncomment to use Buddy Replication -->
+
+ <!--
+
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+
+ <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/>
+
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+
+ <properties>
+
+ numBuddies = 1
+
+ ignoreColocatedBuddies = true
+
+ </properties>
+
+ </locator>
+
+ </buddy>
+
+ -->
+
+
+
+ <!--
+
+ Configures the JGroups channel. Looks up a JGroups config file on the classpath or filesystem. udp.xml
+
+ ships with jgroups.jar and will be picked up by the class loader.
+
+ -->
+
+ <jgroupsConfig configFile="udp.xml">
+
+ <!-- uncomment to define a JGroups stack here
+
+
+
+ <PING timeout="2000" num_initial_members="3"/>
+
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+
+ <FD_SOCK/>
+
+ <FD timeout="10000" max_tries="5" shun="true"/>
+
+ <VERIFY_SUSPECT timeout="1500"/>
+
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+
+ retransmit_timeout="300,600,1200,2400,4800"
+
+ discard_delivered_msgs="true"/>
+
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+
+ max_bytes="400000"/>
+
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+
+ <FRAG2 frag_size="60000"/>
+
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+
+ <pbcast.FLUSH timeout="0"/>
+
+ -->
+
+ </jgroupsConfig>
+
+ </clustering>
+
+
+
+ <!--
+
+ Eviction configuration. WakeupInterval defines how often the eviction thread runs, in milliseconds. 0 means
+
+ the eviction thread will never run.
+
+ -->
+
+ <eviction wakeUpInterval="500">
+
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+
+ <property name="maxNodes" value="5000" />
+
+ <property name="timeToLive" value="1000" />
+
+ </default>
+
+ <region name="/org/jboss/data1">
+
+ <property name="timeToLive" value="2000" />
+
+ </region>
+
+ <region name="/org/jboss/data2" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="100000">
+
+ <property name="maxNodes" value="3000" />
+
+ <property name="minTimeToLive" value="4000" />
+
+ </region>
+
+ </eviction>
+
+
+
+ <!--
+
+ Cache loaders.
+
+
+
+ If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
+
+ is accessed again, it is removed from the cache loader and loaded into memory.
+
+
+
+ Otherwise, state is always maintained in the cache loader as well as in memory.
+
+ Set 'shared' to true if all instances in the cluster use the same cache loader instance, e.g., are talking to the
+
+ same database.
+
+ -->
+
+ <loaders passivation="true" shared="false">
+
+ <preload>
+
+ <node fqn="/org/jboss"/>
+
+ <node fqn="/org/tempdata"/>
+
+ </preload>
+
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader">
+ <properties>
+ cache.jdbc.driver=org.hsqldb.jdbcDriver
+ cache.jdbc.url=jdbc:hsqldb:hsql://localhost:9001/ftpcache
+ cache.jdbc.user=sa
+ cache.jdbc.password=
+ cache.jdbc.node.type=OBJECT
+
+ </properties>
+ </loader>
+ </loaders>
+
+
+
+ <!--
+
+ Define custom interceptors. All custom interceptors need to extend org.jboss.cache.interceptors.base.CommandInterceptor
+
+ -->
+
+ <!--
+
+ <customInterceptors>
+
+ <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor">
+
+ <property name="attrOne" value="value1" />
+
+ <property name="attrTwo" value="value2" />
+
+ </interceptor>
+
+ <interceptor position="last" class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/>
+
+ <interceptor index="3" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/>
+
+ <interceptor before="org.jboss.cache.interceptors.CallInterceptor"
+
+ class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/>
+
+ <interceptor after="org.jboss.cache.interceptors.CallInterceptor"
+
+ class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/>
+
+ </customInterceptors>
+
+ -->
+
+</jbosscache>
+
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -30,6 +30,19 @@
<available file="${product.dir}/build-distr.xml"/>
</condition>
+ <echo>product.dir=${product.dir}</echo>
+ <echo>${hierarchy.test.server.config}</echo>
+
+ <condition property="hierarchy.quickstart.tests">
+ <and>
+ <available file="${product.dir}/install"/>
+ <available file="${product.dir}/javadocs"/>
+ <available file="${product.dir}/lib"/>
+ <available file="${product.dir}/samples"/>
+ <available file="${product.dir}/xml"/>
+ </and>
+ </condition>
+
<!-- Are we embedded in a jbossesb distribution hierarchy? -->
<condition property="hierarchy.jbossesb">
<and>
@@ -63,6 +76,7 @@
<or>
<isset property="build.jbossesb"/>
<isset property="hierarchy.jbossesb-server"/>
+ <isset property="hierarchy.quickstart.tests"/>
</or>
</condition>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/services/base-project-build.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/services/base-project-build.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -50,7 +50,10 @@
<pathelement location="build/test/classes" />
<fileset dir="${esb.main.lib}" includes="jboss-system-*.jar" />
<fileset dir="lib/ext" includes="*.jar" />
- <fileset dir="build/lib" includes="*.jar"/>
+ <fileset dir="build/lib">
+ <include name="*.jar"/>
+ <exclude name="ant**"/>
+ </fileset>
<fileset dir="lib/ext/build-time" includes="*.jar" />
<fileset dir="${esb.product.lib.ext}/endorsed" includes="jboss-saaj.jar" />
<fileset dir="${esb.product.lib.dir}" includes="jbossesb-rosetta.jar jbossesb-config-model*.jar test-util.jar" />
@@ -216,7 +219,7 @@
<pathelement location="${coverage.dir}/instr"/>
<pathelement location="build/tests/classes/"/>
<path refid="exec.classpath" />
- <path refid="test.classpath" />
+ <path refid="test.classpath" />
<pathelement location="../soapui-client/target/aop-classes"/>
</classpath>
<!-- emma jvm args -->
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -42,8 +42,10 @@
<path refid="base-classpath" />
<fileset dir="../../lib/ext" includes="*.jar"/>
- <fileset dir="../../build/lib" includes="*.jar"/>
-
+ <fileset dir="../../build/lib">
+ <include name="*.jar"/>
+ <exclude name="ant**"/>
+ </fileset>
<!-- Adding the Smooks jars... -->
<fileset dir="../smooks/lib/ext" includes="*.jar"/>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/services/soapui-client/build.xml 2011-08-17 09:07:28 UTC (rev 37424)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/services/soapui-client/build.xml 2011-08-18 18:06:00 UTC (rev 37425)
@@ -29,7 +29,10 @@
<fileset dir="../../build/lib" includes="jboss-system-4.2.2.GA.jar" />
<fileset dir="src/lib" includes="*.jar" />
<fileset dir="../../lib/ext" includes="*.jar" />
- <fileset dir="../../build/lib" includes="*.jar" />
+ <fileset dir="../../build/lib">
+ <include name="*.jar" />
+ <exclude name="ant**"/>
+ </fileset>
<fileset dir="../../../testlib" includes="*.jar"/>
<path refid="jboss-esb-dependencies" />
</path>
More information about the jboss-svn-commits
mailing list