JBoss Cache SVN: r8193 - core/tags.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-18 15:11:08 -0400 (Tue, 18 Aug 2009)
New Revision: 8193
Added:
core/tags/3.2.0.GA/
Log:
Copied: core/tags/3.2.0.GA (from rev 8192, core/trunk)
15 years, 4 months
JBoss Cache SVN: r8192 - core/trunk/src/main/java/org/jboss/cache/loader.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-18 06:44:01 -0400 (Tue, 18 Aug 2009)
New Revision: 8192
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java
Log:
[JBCACHE-1534] (JDBCCacheLoader does not escape wildcard characters in generated LIKE clause) Patch submitted by Andrew Duckworth
Modified: core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java 2009-08-18 10:43:24 UTC (rev 8191)
+++ core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java 2009-08-18 10:44:01 UTC (rev 8192)
@@ -95,6 +95,8 @@
*/
public Object put(Fqn name, Object key, Object value) throws Exception
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("put name=" + name + " key=" + key + " value=" + value);
lock.acquireLock(name, true);
try
{
@@ -135,6 +137,8 @@
*/
public void put(Fqn name, Map attributes) throws Exception
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("put name=" + name + " attr=" + attributes);
lock.acquireLock(name, true);
Map toStore = attributes;
if (toStore != null && !(toStore instanceof HashMap)) toStore = new HashMap(attributes);
@@ -311,9 +315,22 @@
private String getFqnWildcardString(String fqnString, Fqn fqn)
{
- return fqnString + (fqn.isRoot() ? "" : Fqn.SEPARATOR) + '%';
+ return escapeSqlLikeParameter(fqnString + (fqn.isRoot() ? "" : Fqn.SEPARATOR)) + '%';
}
+ /**
+ * Escape all characters occurring in the FQN string that have significance to SQL within a LIKE clause. Escape character '^'
+ * must match value in JDBCCacheLoaderConfig.constructRecursiveChildrenSql. This method
+ * doubles any occurrence of the escape character '^' and replaces any occurrence of wildcard characters '_' '%' with escaped version e.g. "^_"
+ *
+ * @param res the fqn as a String
+ * @return the escaped result
+ */
+ private String escapeSqlLikeParameter(String res)
+ {
+ return res.replaceAll("([_%^])", "^$1");
+ }
+
private Map<Object, Object> readAttributes(ResultSet rs, int index) throws SQLException
{
Map<Object, Object> result;
@@ -340,6 +357,8 @@
private void addNewSubtree(Fqn name, Map attributes) throws Exception
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("addNewSubtree name=" + name + " attr=" + attributes);
Fqn currentNode = name;
do
{
Modified: core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java 2009-08-18 10:43:24 UTC (rev 8191)
+++ core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java 2009-08-18 10:44:01 UTC (rev 8192)
@@ -149,12 +149,12 @@
private String constructRecursiveChildrenSql()
{
- return "SELECT " + fqnColumn + "," + nodeColumn + " FROM " + table + " WHERE " + fqnColumn + " = ? OR " + fqnColumn + " LIKE ?";
+ return "SELECT " + fqnColumn + "," + nodeColumn + " FROM " + table + " WHERE " + fqnColumn + " = ? OR " + fqnColumn + " LIKE ? ESCAPE '^'";
}
@Override
protected String constructDeleteNodeSql()
{
- return "DELETE FROM " + table + " WHERE " + fqnColumn + " = ? OR " + fqnColumn + " LIKE ?";
+ return "DELETE FROM " + table + " WHERE " + fqnColumn + " = ? OR " + fqnColumn + " LIKE ? ESCAPE '^'";
}
}
\ No newline at end of file
15 years, 4 months
JBoss Cache SVN: r8191 - core/trunk/src/main/java/org/jboss/cache/loader.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-18 06:43:24 -0400 (Tue, 18 Aug 2009)
New Revision: 8191
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java
Log:
[JBCACHE-1533] (JDBCCacheLoader does not honour the create/drop false property for the jbosscache_D table) Patch submitted by Andrew Duckworth
Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java 2009-08-18 09:36:45 UTC (rev 8190)
+++ core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java 2009-08-18 10:43:24 UTC (rev 8191)
@@ -306,37 +306,48 @@
cf.close(con);
}
- createDummyTableIfNeeded();
+ if (config.getCreateTable())
+ {
+ createDummyTableIfNeeded();
+ }
}
private void createDummyTableIfNeeded() throws Exception
{
Connection conn = null;
PreparedStatement ps = null;
- try
+
+ if (config.getDropTable())
{
- conn = cf.getConnection();
- ps = prepareAndLogStatement(conn, config.getDummyTableRemovalDDL());
- ps.execute();
+ try
+ {
+ conn = cf.getConnection();
+ ps = prepareAndLogStatement(conn, config.getDummyTableRemovalDDL());
+ ps.execute();
+ }
+ catch (Exception e)
+ {
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("No need to drop tables!");
+ }
+ finally
+ {
+ safeClose(ps);
+ cf.close(conn);
+ }
}
- catch (Exception e)
- {
- if (getLogger().isTraceEnabled()) getLogger().trace("No need to drop tables!");
- }
- finally
- {
- safeClose(ps);
- cf.close(conn);
- }
-
+
try
{
conn = cf.getConnection();
- ps = prepareAndLogStatement(conn, config.getDummyTableCreationDDL());
- ps.execute();
- safeClose(ps);
- ps = prepareAndLogStatement(conn, config.getDummyTablePopulationSql());
- ps.execute();
+ if (!tableExists(config.getDummyTable(), conn))
+ {
+ ps = prepareAndLogStatement(conn, config.getDummyTableCreationDDL());
+ ps.execute();
+ safeClose(ps);
+ ps = prepareAndLogStatement(conn, config.getDummyTablePopulationSql());
+ ps.execute();
+ }
}
finally
{
@@ -392,6 +403,8 @@
*/
public boolean exists(Fqn name) throws Exception
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("exists name=" + name);
lock.acquireLock(name, false);
Connection conn = null;
PreparedStatement ps = null;
@@ -401,7 +414,10 @@
conn = cf.getConnection();
ps = prepareAndLogStatement(conn, config.getExistsSql(), name.toString());
rs = ps.executeQuery();
- return rs.next();
+ boolean res = rs.next();
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("exists name=" + name + " is " + res);
+ return res;
}
finally
{
@@ -422,6 +438,8 @@
*/
public Object remove(Fqn name, Object key) throws Exception
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("remove name=" + name);
lock.acquireLock(name, true);
try
{
@@ -459,6 +477,8 @@
@SuppressWarnings("unchecked")
protected Map<Object, Object> loadNode(Fqn name)
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("loadNode name=" + name);
boolean rowExists = false;
Connection con = null;
PreparedStatement ps = null;
@@ -515,6 +535,8 @@
*/
protected void insertNode(Fqn name, Map dataMap, boolean rowMayExist)
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("insertNode name=" + name + " dataMap=" + dataMap);
Connection con = null;
PreparedStatement ps = null;
try
@@ -598,6 +620,8 @@
*/
protected void updateNode(Fqn name, Map<Object, Object> node)
{
+ if (getLogger().isTraceEnabled())
+ getLogger().trace("updateNode name=" + name);
Connection con = null;
PreparedStatement ps = null;
try
Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2009-08-18 09:36:45 UTC (rev 8190)
+++ core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2009-08-18 10:43:24 UTC (rev 8191)
@@ -251,6 +251,11 @@
this.table = table;
}
+ public String getDummyTable()
+ {
+ return table + "_D";
+ }
+
public String getUpdateTableSql()
{
return updateTableSql;
15 years, 4 months
JBoss Cache SVN: r8190 - core/trunk/src/main/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-18 05:36:45 -0400 (Tue, 18 Aug 2009)
New Revision: 8190
Modified:
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
Log:
[JBCACHE-1531] ( Replication is allowed when buddy group state is inconsistent ) backing out fix
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2009-08-18 05:55:29 UTC (rev 8189)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2009-08-18 09:36:45 UTC (rev 8190)
@@ -23,16 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.CacheException;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.DataContainer;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.Node;
-import org.jboss.cache.NodeSPI;
-import org.jboss.cache.RPCManager;
-import org.jboss.cache.Region;
-import org.jboss.cache.RegionEmptyException;
-import org.jboss.cache.RegionManager;
+import org.jboss.cache.*;
import org.jboss.cache.commands.CommandsFactory;
import org.jboss.cache.commands.ReplicableCommand;
import org.jboss.cache.commands.VisitableCommand;
@@ -56,7 +47,6 @@
import org.jboss.cache.notifications.event.ViewChangedEvent;
import org.jboss.cache.statetransfer.StateTransferManager;
import org.jboss.cache.util.concurrent.ConcurrentHashSet;
-import org.jboss.cache.util.concurrent.ReclosableLatch;
import org.jboss.cache.util.reflect.ReflectionUtil;
import org.jboss.util.stream.MarshalledValueInputStream;
import org.jboss.util.stream.MarshalledValueOutputStream;
@@ -66,19 +56,7 @@
import org.jgroups.util.Util;
import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.Vector;
+import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -179,8 +157,11 @@
private BuddyFqnTransformer buddyFqnTransformer;
private ConcurrentMap<String, Set<DefunctDataHistory>> defunctDataHistory = new ConcurrentHashMap<String, Set<DefunctDataHistory>>();
- private final ReclosableLatch buddyMembershipInFluxLatch = new ReclosableLatch(true);
+ // Backing out fix for JBCACHE-1531 for 3.2.0. Maybe this can come in in a future release, after more thought and
+ // analysis. - Manik, 18 Aug 2009
+// private final ReclosableLatch buddyMembershipInFluxLatch = new ReclosableLatch(true);
+
public BuddyManager()
{
}
@@ -448,9 +429,9 @@
*/
private void reassignBuddies(List<Address> members) throws CacheException
{
- buddyMembershipInFluxLatch.close();
- try
- {
+// buddyMembershipInFluxLatch.close();
+// try
+// {
List<Address> membership = new ArrayList<Address>(members); // defensive copy
if (log.isDebugEnabled())
@@ -517,11 +498,11 @@
}
else
log.debug("Nothing has changed; new buddy list is identical to the old one.");
- }
- finally
- {
- buddyMembershipInFluxLatch.open();
- }
+// }
+// finally
+// {
+// buddyMembershipInFluxLatch.open();
+// }
}
/**
@@ -781,14 +762,14 @@
*/
public List<Address> getBuddyAddresses()
{
- try
- {
- buddyMembershipInFluxLatch.await();
- }
- catch (InterruptedException e)
- {
- Thread.currentThread().interrupt();
- }
+// try
+// {
+// buddyMembershipInFluxLatch.await();
+// }
+// catch (InterruptedException e)
+// {
+// Thread.currentThread().interrupt();
+// }
return buddyGroup.getBuddies();
}
@@ -799,14 +780,14 @@
*/
public Vector<Address> getBuddyAddressesAsVector()
{
- try
- {
- buddyMembershipInFluxLatch.await();
- }
- catch (InterruptedException e)
- {
- Thread.currentThread().interrupt();
- }
+// try
+// {
+// buddyMembershipInFluxLatch.await();
+// }
+// catch (InterruptedException e)
+// {
+// Thread.currentThread().interrupt();
+// }
return buddyGroup.getBuddiesAsVector();
}
15 years, 4 months
JBoss Cache SVN: r8189 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-08-18 01:55:29 -0400 (Tue, 18 Aug 2009)
New Revision: 8189
Added:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/DataGravitationCleanupFromDefunctTreeTest.java
Modified:
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
Log:
[JBCACHE-1530] Do it right this time
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2009-08-17 15:09:11 UTC (rev 8188)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2009-08-18 05:55:29 UTC (rev 8189)
@@ -761,7 +761,7 @@
{
coreFqn = buddyFqnTransformer.getActualFqn(backupFqn);
}
- Fqn<?> base = Fqn.fromRelativeElements(BUDDY_BACKUP_SUBTREE_FQN, gen.owner, Integer.valueOf(gen.generation));
+ Fqn<?> base = Fqn.fromRelativeElements(buddyFqnTransformer.getDeadBackupRoot(gen.owner), Integer.valueOf(gen.generation));
result.add(Fqn.fromRelativeFqn(base, coreFqn));
}
}
@@ -1186,7 +1186,7 @@
historySet = newHistorySet;
}
- DefunctDataHistory history = new DefunctDataHistory(ownerName, (Integer) defunctBackupRootFqn.getLastElement(), System.currentTimeMillis());
+ DefunctDataHistory history = new DefunctDataHistory(dataOwner, (Integer) defunctBackupRootFqn.getLastElement(), System.currentTimeMillis());
historySet.add(history);
for (Object child : backupRoot.getChildren())
@@ -1412,13 +1412,13 @@
private class DefunctDataHistory
{
- private final String owner;
+ private final Address owner;
private final int generation;
private final long timestamp;
private long dataMoved;
private long moveElapsedTime;
- private DefunctDataHistory(String owner, int generation, long timestamp)
+ private DefunctDataHistory(Address owner, int generation, long timestamp)
{
this.owner = owner;
this.generation = generation;
@@ -1434,11 +1434,11 @@
private boolean isStale()
{
if (dataMoved == 0)
- return false;
+ return false; // migration is still ongoing
long max = Math.max(BuddyManager.this.configuration.getLockAcquisitionTimeout(), 60000);
max = max + moveElapsedTime;
- return System.currentTimeMillis() - max < dataMoved;
+ return System.currentTimeMillis() - max > dataMoved;
}
}
}
\ No newline at end of file
Added: core/trunk/src/test/java/org/jboss/cache/buddyreplication/DataGravitationCleanupFromDefunctTreeTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/DataGravitationCleanupFromDefunctTreeTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/DataGravitationCleanupFromDefunctTreeTest.java 2009-08-18 05:55:29 UTC (rev 8189)
@@ -0,0 +1,124 @@
+package org.jboss.cache.buddyreplication;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeCreated;
+import org.jboss.cache.notifications.event.NodeCreatedEvent;
+import org.jboss.cache.transaction.DummyTransactionManagerLookup;
+import org.jboss.cache.util.TestingUtil;
+import org.testng.annotations.Test;
+
+/**
+ * Test for handling of JBCACHE-1530.
+ *
+ * @author Brian Stansberry
+ */
+@Test(groups = "functional", testName = "buddyreplication.DataGravitationCleanupFromDefunctTreeTest")
+public class DataGravitationCleanupFromDefunctTreeTest extends BuddyReplicationTestsBase
+{
+ @CacheListener
+ public static class GravitationBlocker
+ {
+ private final Fqn<String> toBlock;
+ private final CountDownLatch toTrigger;
+ private final CountDownLatch toAwait;
+ private boolean blocked;
+
+ GravitationBlocker(Fqn<String> toBlock, CountDownLatch toTrigger, CountDownLatch toAwait)
+ {
+ this.toBlock = toBlock;
+ this.toTrigger = toTrigger;
+ this.toAwait = toAwait;
+ }
+
+ @NodeCreated
+ public void nodeAdded(NodeCreatedEvent event)
+ {
+ if (!blocked && event.isOriginLocal() && event.getFqn().equals(toBlock))
+ {
+ blocked = true;
+ toTrigger.countDown();
+ try
+ {
+// System.out.println("blocking " + System.currentTimeMillis());
+ toAwait.await(10, TimeUnit.SECONDS);
+// System.out.println("released " + System.currentTimeMillis());
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+ }
+
+ public void testOwnerDiesInMidGravitation() throws Exception
+ {
+ final List<CacheSPI<Object, Object>> caches = createCaches(1, 4, false, false, false, false);
+ cachesTL.set(caches);
+
+ for (CacheSPI<Object, Object> c : caches)
+ {
+ c.getConfiguration().setFetchInMemoryState(false);
+ c.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+ c.start();
+ }
+
+ waitForBuddy(caches.get(0), caches.get(1), false);
+ waitForBuddy(caches.get(1), caches.get(2), false);
+ waitForBuddy(caches.get(2), caches.get(3), false);
+ waitForBuddy(caches.get(3), caches.get(0), false);
+ Thread.sleep(2000);//wait for state transfer
+
+ final Fqn<String> fqn = Fqn.fromString("/0");
+ caches.get(0).put(fqn, "k", "v");
+ Fqn backup = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), fqn);
+ assert (caches.get(1).exists(backup));
+
+ CountDownLatch toTrigger = new CountDownLatch(1);
+ CountDownLatch toAwait = new CountDownLatch(1);
+ GravitationBlocker blocker = new GravitationBlocker(fqn, toTrigger, toAwait);
+ caches.get(2).addCacheListener(blocker);
+
+ Future<?> future = Executors.newSingleThreadExecutor().submit(new Runnable() {
+ public void run() {
+ // Trigger a gravitation
+ caches.get(2).getInvocationContext().getOptionOverrides().setForceDataGravitation(true);
+ caches.get(2).get(fqn, "k");
+ }
+ });
+
+ assert (toTrigger.await(5, TimeUnit.SECONDS));
+
+ // Gravitation is now blocking on adding data to cache2
+
+ caches.get(0).stop();
+// System.out.println("stopped 0 " + System.currentTimeMillis());
+ // TODO need a way to know when this is done
+ TestingUtil.sleepThread(1000); // buddy group re-formation is async
+
+ toAwait.countDown(); // gravitation can now complete
+ assert (future.get(5, TimeUnit.SECONDS) == null); // and it now is complete
+
+ assert (blocker.blocked);
+
+ backup = fqnTransformer.getBackupFqn(caches.get(2).getLocalAddress(), fqn);
+ assert (caches.get(3).exists(backup));
+
+ assert ("v".equals(caches.get(2).put(fqn, "k", "v1")));
+
+ // Now we gravitate to cache1. IF it has original "v" in its :DEAD tree
+ // it will gravitate that rather than asking cache3 and the assert will fail
+
+ caches.get(1).getInvocationContext().getOptionOverrides().setForceDataGravitation(true);
+ Object val = caches.get(1).get(fqn, "k");
+ assert "v1".equals(val) : val + " is 'v1'";
+ }
+}
Property changes on: core/trunk/src/test/java/org/jboss/cache/buddyreplication/DataGravitationCleanupFromDefunctTreeTest.java
___________________________________________________________________
Name: svn:keywords
+
15 years, 4 months
JBoss Cache SVN: r8188 - in core/tags/3.2.0.CR1: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-17 11:09:11 -0400 (Mon, 17 Aug 2009)
New Revision: 8188
Modified:
core/tags/3.2.0.CR1/pom.xml
core/tags/3.2.0.CR1/src/main/java/org/jboss/cache/Version.java
Log:
Modified: core/tags/3.2.0.CR1/pom.xml
===================================================================
--- core/tags/3.2.0.CR1/pom.xml 2009-08-17 15:04:19 UTC (rev 8187)
+++ core/tags/3.2.0.CR1/pom.xml 2009-08-17 15:09:11 UTC (rev 8188)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.2.0-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>3.2.0.CR1</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
@@ -473,7 +473,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jbosscache-core-version>3.2.0-SNAPSHOT-JBossAS</jbosscache-core-version>
+ <jbosscache-core-version>3.2.0.CR1-JBossAS</jbosscache-core-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
<protocol.stack>tcp</protocol.stack>
</properties>
Modified: core/tags/3.2.0.CR1/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/tags/3.2.0.CR1/src/main/java/org/jboss/cache/Version.java 2009-08-17 15:04:19 UTC (rev 8187)
+++ core/tags/3.2.0.CR1/src/main/java/org/jboss/cache/Version.java 2009-08-17 15:09:11 UTC (rev 8188)
@@ -32,10 +32,10 @@
@Immutable
public class Version
{
- public static final String version = "3.2.0-SNAPSHOT";
+ public static final String version = "3.2.0.CR1";
public static final String codename = "Malagueta";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0', '3', '2', '0', 'S'};
+ static final byte[] version_id = {'0', '3', '2', '0', 'C', '1'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
15 years, 4 months
JBoss Cache SVN: r8187 - core/tags.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-17 11:04:19 -0400 (Mon, 17 Aug 2009)
New Revision: 8187
Added:
core/tags/3.2.0.CR1/
Log:
Copied: core/tags/3.2.0.CR1 (from rev 8186, core/trunk)
15 years, 4 months
