October 2007 - jbosscache-commits

JBoss Cache SVN: r4701 - core/trunk/src/test/java/org/jboss/cache/statetransfer.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2007-10-29 05:46:58 -0400 (Mon, 29 Oct 2007) New Revision: 4701 Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java Log: Disabled test for CR1 Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java 2007-10-27 11:00:59 UTC (rev 4700) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java 2007-10-29 09:46:58 UTC (rev 4701) @@ -1,12 +1,5 @@ package org.jboss.cache.statetransfer; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; - import org.jboss.cache.Cache; import org.jboss.cache.CacheSPI; import org.jboss.cache.DefaultCacheFactory; @@ -19,13 +12,19 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.transaction.SystemException; +import javax.transaction.UserTransaction; +import java.util.Properties; + /** * Tests state transfer while the other node keeps sending transactional, synchronous method calls * * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, enabled = false) public class StateTransferUnderLoadTest { Cache<Object, Object> cache1, cache2;

16 years, 6 months

1
0
0 / 0

Build failed in Hudson: jboss-cache-core-jdk1.6 » JBoss Cache - Core Edition #93

by jboss-qa-internal＠redhat.com

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.6/org.jboss.cac... ------------------------------------------ started Building remotely on conf2-linux $ /qa/tools/opt/jdk1.6.0_02/bin/java -Xmx256m -cp /home/hudson/hudson_workspace/maven-agent.jar:/qa/tools/opt/maven-2.0.6/boot/classworlds-1.1.jar hudson.maven.agent.Main /qa/tools/opt/maven-2.0.6 /qa/services/hudson/hudson_1.149/slave.jar /home/hudson/hudson_workspace/maven-interceptor.jar channel started [INFO] Scanning for projects... [INFO] snapshot org.jboss.cache:jbosscache-common-parent:1.1-SNAPSHOT: checking for updates from snapshots.jboss.org WAGON_VERSION: 1.0-beta-2 [INFO] ---------------------------------------------------------------------------- [INFO] Building JBoss Cache - Core Edition [INFO] task-segment: [clean, site] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /home/hudson/hudson_workspace/workspace/jboss-cache-core-jdk1.6/./target [HUDSON] Archiving /home/hudson/hudson_workspace/workspace/jboss-cache-core-jdk1.6/./pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to delete directory: /home/hudson/hudson_workspace/workspace/jboss-cache-core-jdk1.6/./target. Reason: Unable to delete directory /home/hudson/hudson_workspace/workspace/jboss-cache-core-jdk1.6/./target/surefire-reports [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 32 seconds [INFO] Finished at: Sun Oct 28 16:16:45 EDT 2007 [INFO] Final Memory: 8M/40M [INFO] ------------------------------------------------------------------------ Sending e-mails to: dpospisi(a)redhat.com Build was marked for publishing on https://hudson.jboss.org/hudson/ finished: FAILURE

16 years, 6 months

1
0
0 / 0

Hudson build became unstable: jboss-cache-1.4.X-jdk1.5 #17

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/17/changes

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4700 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2007-10-27 07:00:59 -0400 (Sat, 27 Oct 2007) New Revision: 4700 Modified: core/trunk/pom.xml Log: Updated JGroups Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2007-10-26 18:31:15 UTC (rev 4699) +++ core/trunk/pom.xml 2007-10-27 11:00:59 UTC (rev 4700) @@ -21,7 +21,7 @@ <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.6.0.Beta1</version> + <version>2.6.0.CR1</version> </dependency> <dependency> <groupId>jdbm</groupId>

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4699 - in pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo: notification and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-10-26 14:31:15 -0400 (Fri, 26 Oct 2007) New Revision: 4699 Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ListTest.java pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/MapTest.java pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java Log: Merge test fixes Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -6,8 +6,8 @@ import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; import org.jboss.cache.pojo.annotation.Replicable; import org.testng.AssertJUnit; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @@ -21,7 +21,7 @@ Log log = LogFactory.getLog(NoZeroArgConstructorTest.class); PojoCache cache, cache1; - @BeforeTest(alwaysRun = true) + @BeforeClass(alwaysRun = true) protected void setUp() throws Exception { log.info("setUp() ...."); @@ -32,7 +32,7 @@ cache1.start(); } - @AfterTest(alwaysRun = true) + @AfterClass(alwaysRun = true) protected void tearDown() throws Exception { cache.stop(); Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ListTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ListTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ListTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -66,6 +66,7 @@ protected void tearDown() throws Exception { cache.stop(); + listener.clear(); } private <T extends Event> T takeNotification(Class<T> clazz) Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/MapTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/MapTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/MapTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -48,8 +48,8 @@ @Test(groups = {"functional"}) public class MapTest { - private PojoCache cache; - private Listener listener = new Listener(); + protected PojoCache cache; + protected Listener listener = new Listener(); @BeforeMethod(alwaysRun = true) @@ -67,6 +67,7 @@ protected void tearDown() throws Exception { cache.stop(); + listener.clear(); } private <T extends Event> T takeNotification(Class<T> clazz) @@ -119,7 +120,7 @@ // Map Attach attach = takeNotification(AttachedEvent.class); - assertSame(map, attach.getSource()); + assertEquals(map, attach.getSource()); } @@ -160,7 +161,7 @@ // Map Attach attach = takeNotification(AttachedEvent.class); - assertSame(map, attach.getSource()); + assertEquals(map, attach.getSource()); // Map remove modify = takeNotification(MapModifiedEvent.class); Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -9,6 +9,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertSame; +import static org.testng.AssertJUnit.assertTrue; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; @@ -30,10 +31,10 @@ * @author Jason T. Greene */ @Test(groups = {"functional"}) -public class ObjectTest +public class ObjectTest { - private PojoCache cache; - private Listener listener; + protected PojoCache cache; + protected Listener listener; @BeforeMethod(alwaysRun = true) @@ -107,13 +108,14 @@ // Person Attach AttachedEvent attach = takeNotification(AttachedEvent.class); - assertEquals(test, attach.getSource()); + Object attached = attach.getSource(); + assertEquals(test, attached); cache.detach("/a"); // Person Detach DetachedEvent detach = takeNotification(DetachedEvent.class); - assertEquals(test, detach.getSource()); + assertSame(attached, detach.getSource()); } public void testFieldNotification() throws Exception Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -61,6 +61,7 @@ { cache.stop(); listenerCache.stop(); + listener.clear(); } protected void verifyNotification(Event notification) Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -42,7 +42,7 @@ * @author Jason T. Greene */ @Test(groups = {"functional"}) -public class ReplicatedMapTest extends ListTest +public class ReplicatedMapTest extends MapTest { private PojoCache listenerCache; Modified: pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java =================================================================== --- pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2007-10-26 18:30:20 UTC (rev 4698) +++ pojo/tags/2.1.0.BETA1/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2007-10-26 18:31:15 UTC (rev 4699) @@ -42,7 +42,7 @@ * @author Jason T. Greene */ @Test(groups = {"functional"}) -public class ReplicatedObjectTest extends ListTest +public class ReplicatedObjectTest extends ObjectTest { private PojoCache listenerCache; @@ -53,6 +53,7 @@ cache.start(); listenerCache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); listenerCache.start(); + listener = new Listener(); listenerCache.addListener(listener); } @AfterMethod(alwaysRun = true)

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4698 - in pojo/trunk/src/test/java/org/jboss/cache/pojo: notification and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-10-26 14:30:20 -0400 (Fri, 26 Oct 2007) New Revision: 4698 Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java Log: Fix tests Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -6,8 +6,8 @@ import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; import org.jboss.cache.pojo.annotation.Replicable; import org.testng.AssertJUnit; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @@ -21,7 +21,7 @@ Log log = LogFactory.getLog(NoZeroArgConstructorTest.class); PojoCache cache, cache1; - @BeforeTest(alwaysRun = true) + @BeforeClass(alwaysRun = true) protected void setUp() throws Exception { log.info("setUp() ...."); @@ -32,7 +32,7 @@ cache1.start(); } - @AfterTest(alwaysRun = true) + @AfterClass(alwaysRun = true) protected void tearDown() throws Exception { cache.stop(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -66,6 +66,7 @@ protected void tearDown() throws Exception { cache.stop(); + listener.clear(); } private <T extends Event> T takeNotification(Class<T> clazz) Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -48,8 +48,8 @@ @Test(groups = {"functional"}) public class MapTest { - private PojoCache cache; - private Listener listener = new Listener(); + protected PojoCache cache; + protected Listener listener = new Listener(); @BeforeMethod(alwaysRun = true) @@ -67,6 +67,7 @@ protected void tearDown() throws Exception { cache.stop(); + listener.clear(); } private <T extends Event> T takeNotification(Class<T> clazz) @@ -119,7 +120,7 @@ // Map Attach attach = takeNotification(AttachedEvent.class); - assertSame(map, attach.getSource()); + assertEquals(map, attach.getSource()); } @@ -160,7 +161,7 @@ // Map Attach attach = takeNotification(AttachedEvent.class); - assertSame(map, attach.getSource()); + assertEquals(map, attach.getSource()); // Map remove modify = takeNotification(MapModifiedEvent.class); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -9,6 +9,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertSame; +import static org.testng.AssertJUnit.assertTrue; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; @@ -30,10 +31,10 @@ * @author Jason T. Greene */ @Test(groups = {"functional"}) -public class ObjectTest +public class ObjectTest { - private PojoCache cache; - private Listener listener; + protected PojoCache cache; + protected Listener listener; @BeforeMethod(alwaysRun = true) @@ -107,13 +108,14 @@ // Person Attach AttachedEvent attach = takeNotification(AttachedEvent.class); - assertEquals(test, attach.getSource()); + Object attached = attach.getSource(); + assertEquals(test, attached); cache.detach("/a"); // Person Detach DetachedEvent detach = takeNotification(DetachedEvent.class); - assertEquals(test, detach.getSource()); + assertSame(attached, detach.getSource()); } public void testFieldNotification() throws Exception Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -61,6 +61,7 @@ { cache.stop(); listenerCache.stop(); + listener.clear(); } protected void verifyNotification(Event notification) Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -42,7 +42,7 @@ * @author Jason T. Greene */ @Test(groups = {"functional"}) -public class ReplicatedMapTest extends ListTest +public class ReplicatedMapTest extends MapTest { private PojoCache listenerCache; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2007-10-26 15:03:50 UTC (rev 4697) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2007-10-26 18:30:20 UTC (rev 4698) @@ -42,7 +42,7 @@ * @author Jason T. Greene */ @Test(groups = {"functional"}) -public class ReplicatedObjectTest extends ListTest +public class ReplicatedObjectTest extends ObjectTest { private PojoCache listenerCache; @@ -53,6 +53,7 @@ cache.start(); listenerCache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); listenerCache.start(); + listener = new Listener(); listenerCache.addListener(listener); } @AfterMethod(alwaysRun = true)

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4697 - in core/trunk/src/main/java/org/jboss/cache: marshall and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2007-10-26 11:03:50 -0400 (Fri, 26 Oct 2007) New Revision: 4697 Modified: core/trunk/src/main/java/org/jboss/cache/Region.java core/trunk/src/main/java/org/jboss/cache/RegionImpl.java core/trunk/src/main/java/org/jboss/cache/RegionManager.java core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java Log: Regions now have 4 states instead of 2: Active, Inactive, Activating, Inactivating - prevents regions from PROVIDING state until they have RECEIVED state. The source of a lot of concurrency headaches. Modified: core/trunk/src/main/java/org/jboss/cache/Region.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/Region.java 2007-10-26 14:42:30 UTC (rev 4696) +++ core/trunk/src/main/java/org/jboss/cache/Region.java 2007-10-26 15:03:50 UTC (rev 4697) @@ -43,6 +43,14 @@ } /** + * Region status + */ + public enum Status + { + ACTIVATING, ACTIVE, INACTIVATING, INACTIVE + } + + /** * Registers a specific {@link ClassLoader} for this region, * overridding the default cache class loader. * @@ -193,4 +201,16 @@ */ Fqn getFqn(); + /** + * A mechanism to set status of a region, more fine grained control than just setActive(); + * @param status status of the region + * @since 2.1.0 + */ + void setStatus(Status status); + + /** + * @return the region's status + */ + Status getStatus(); + } Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2007-10-26 14:42:30 UTC (rev 4696) +++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2007-10-26 15:03:50 UTC (rev 4697) @@ -31,7 +31,7 @@ private RegionManager regionManager; private Fqn fqn; - private boolean active; + private Status status; private ClassLoader classLoader; private BlockingQueue<EvictedEventNode> nodeEventQueue = null; private int capacityWarnThreshold = 0; @@ -45,7 +45,7 @@ { this.fqn = fqn; this.regionManager = regionManager; - this.active = !regionManager.isDefaultInactive(); + status = !regionManager.isDefaultInactive() ? Status.ACTIVE : Status.INACTIVE; } /** @@ -80,24 +80,24 @@ public void activate() { regionManager.activate(fqn); - active = true; + status = Status.ACTIVE; } public void activateIfEmpty() { regionManager.activateIfEmpty(fqn); - active = true; + status = Status.ACTIVE; } public void deactivate() { regionManager.deactivate(fqn); - active = false; + status = Status.INACTIVE; } public boolean isActive() { - return active; + return status == Status.ACTIVE; } public ClassLoader getClassLoader() @@ -110,9 +110,19 @@ return fqn; } + public void setStatus(Status status) + { + this.status = status; + } + + public Status getStatus() + { + return status; + } + public void setActive(boolean b) { - active = b; + status = b ? Status.ACTIVE : Status.INACTIVE; } // -------- eviction stuff ----- @@ -135,7 +145,7 @@ return "RegionImpl{" + "fqn=" + fqn + "; classloader="+ classLoader + - "; active=" + active + + "; status=" + status + "; eviction=" + (getEvictionPolicy() != null) + "; timerThreadRegistered=" + (getEvictionPolicy() != null && regionManager.getEvictionTimerTask().isRegionRegisteredForProcessing(this)) + '}'; Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2007-10-26 14:42:30 UTC (rev 4696) +++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2007-10-26 15:03:50 UTC (rev 4697) @@ -3,6 +3,7 @@ import net.jcip.annotations.ThreadSafe; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import static org.jboss.cache.Region.Type.*; import org.jboss.cache.buddyreplication.BuddyManager; import org.jboss.cache.config.ConfigurationException; import org.jboss.cache.config.EvictionConfig; @@ -10,7 +11,6 @@ import org.jboss.cache.eviction.EvictionTimerTask; import org.jboss.cache.eviction.RegionNameConflictException; import org.jboss.cache.lock.NodeLock; -import static org.jboss.cache.Region.Type.*; import org.jgroups.Address; import java.util.ArrayList; @@ -295,6 +295,7 @@ else { //r.activate(); + r.setStatus(Region.Status.ACTIVATING); if (cache.getConfiguration().isFetchInMemoryState()) { activateRegion(r.getFqn(), suppressRegionNotEmptyException); @@ -307,6 +308,7 @@ // "Active" region is not the default, so create a region r = getRegion(fqn, true); // FIXME - persistent state transfer counts too! + r.setStatus(Region.Status.ACTIVATING); if (cache.getConfiguration().isFetchInMemoryState()) { activateRegion(r.getFqn(), suppressRegionNotEmptyException); Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2007-10-26 14:42:30 UTC (rev 4696) +++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2007-10-26 15:03:50 UTC (rev 4697) @@ -10,6 +10,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.Region; +import static org.jboss.cache.Region.Status; import org.jboss.cache.RegionManager; import org.jboss.cache.buddyreplication.GravitateResult; import org.jboss.cache.optimistic.DefaultDataVersion; @@ -212,7 +213,8 @@ if (region != null) { - if (!region.isActive()) + Status status = region.getStatus(); + if (status == Status.INACTIVATING || status == Status.INACTIVE) { if (log.isDebugEnabled()) {

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4696 - in pojo/tags/2.1.0.BETA1: src/main/release and 1 other directories.

by jbosscache-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-10-26 10:42:30 -0400 (Fri, 26 Oct 2007) New Revision: 4696 Added: pojo/tags/2.1.0.BETA1/src/main/release/licenses/ pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt Removed: pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt Modified: pojo/tags/2.1.0.BETA1/assembly/all.xml pojo/tags/2.1.0.BETA1/assembly/bin.xml pojo/tags/2.1.0.BETA1/src/main/release/build.xml Log: Merge release fixes Modified: pojo/tags/2.1.0.BETA1/assembly/all.xml =================================================================== --- pojo/tags/2.1.0.BETA1/assembly/all.xml 2007-10-26 14:39:54 UTC (rev 4695) +++ pojo/tags/2.1.0.BETA1/assembly/all.xml 2007-10-26 14:42:30 UTC (rev 4696) @@ -47,8 +47,8 @@ <directory>src/main/release</directory> <outputDirectory/> <includes> - <include>*.txt</include> - <include>*.xml</include> + <include>**/*.txt</include> + <include>**/*.xml</include> </includes> </fileSet> Modified: pojo/tags/2.1.0.BETA1/assembly/bin.xml =================================================================== --- pojo/tags/2.1.0.BETA1/assembly/bin.xml 2007-10-26 14:39:54 UTC (rev 4695) +++ pojo/tags/2.1.0.BETA1/assembly/bin.xml 2007-10-26 14:42:30 UTC (rev 4696) @@ -28,8 +28,8 @@ <directory>src/main/release</directory> <outputDirectory/> <includes> - <include>*.txt</include> - <include>*.xml</include> + <include>**/*.txt</include> + <include>**/*.xml</include> </includes> </fileSet> Modified: pojo/tags/2.1.0.BETA1/src/main/release/build.xml =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/build.xml 2007-10-26 14:39:54 UTC (rev 4695) +++ pojo/tags/2.1.0.BETA1/src/main/release/build.xml 2007-10-26 14:42:30 UTC (rev 4696) @@ -22,7 +22,7 @@  <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <taskdef name="testng" classpath="lib/test/testng.jar" classname="org.testng.TestNGAntTask"/> + <taskdef name="testng" classpath="lib/testng.jar" classname="org.testng.TestNGAntTask"/>  <path id="lib.classpath"> Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses (from rev 4694, pojo/trunk/src/main/release/licenses) Deleted: pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt =================================================================== --- pojo/trunk/src/main/release/licenses/LICENSE-bdbje-lib.txt 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2002-2006 - * Oracle Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Redistributions in any form must be accompanied by information on - * how to obtain complete source code for the DB software and any - * accompanying software that uses the DB software. The source code - * must either be included in the distribution or be available for no - * more than the cost of distribution plus a nominal fee, and must be - * freely redistributable under reasonable conditions. For an - * executable file, complete source code means the source code for all - * modules it contains. It does not include source code for modules or - * files that typically accompany the major components of the operating - * system on which the executable file runs. - * - * THIS SOFTWARE IS PROVIDED BY ORACLE CORPORATION ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR - * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ \ No newline at end of file Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt (from rev 4694, pojo/trunk/src/main/release/licenses/LICENSE-bdbje-lib.txt) =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt (rev 0) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/LICENSE-bdbje-lib.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2002-2006 + * Oracle Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Redistributions in any form must be accompanied by information on + * how to obtain complete source code for the DB software and any + * accompanying software that uses the DB software. The source code + * must either be included in the distribution or be available for no + * more than the cost of distribution plus a nominal fee, and must be + * freely redistributable under reasonable conditions. For an + * executable file, complete source code means the source code for all + * modules it contains. It does not include source code for modules or + * files that typically accompany the major components of the operating + * system on which the executable file runs. + * + * THIS SOFTWARE IS PROVIDED BY ORACLE CORPORATION ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR + * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ \ No newline at end of file Deleted: pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt =================================================================== --- pojo/trunk/src/main/release/licenses/README-bdbje-lib.txt 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -1,20 +0,0 @@ - -$Id$ - -NAME: Sleepycat Berkeley DB Java Edition -VERSION: 1.7.0 -PROJECT: http://www.oracle.com/database/berkeley-db/je/index.html -PURPOSE: Used for Berkeley DB-based CacheLoader (org.jboss.cache.loader.bdbje.BdbjeCacheLoader) in JBossCache -RESTRICTION: JBossCache can use Berkeley DB Java Edition from Oracle - for persistent, reliable and transaction-protected - data storage. If you choose to use Berkeley DB Java Edition - with JBossCache, you must comply with the terms of - Oracle's public license, included in the file LICENSE.txt. - If you prefer not to release the source code for your own - application in order to comply with the Oracle public - license, you may purchase a different license for use of - Berkeley DB Java Edition with JBossCache. For details, - please go to: - - http://www.oracle.com/database/berkeley-db/je/index.html - \ No newline at end of file Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt (from rev 4694, pojo/trunk/src/main/release/licenses/README-bdbje-lib.txt) =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt (rev 0) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/README-bdbje-lib.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -0,0 +1,20 @@ + +$Id$ + +NAME: Sleepycat Berkeley DB Java Edition +VERSION: 1.7.0 +PROJECT: http://www.oracle.com/database/berkeley-db/je/index.html +PURPOSE: Used for Berkeley DB-based CacheLoader (org.jboss.cache.loader.bdbje.BdbjeCacheLoader) in JBossCache +RESTRICTION: JBossCache can use Berkeley DB Java Edition from Oracle + for persistent, reliable and transaction-protected + data storage. If you choose to use Berkeley DB Java Edition + with JBossCache, you must comply with the terms of + Oracle's public license, included in the file LICENSE.txt. + If you prefer not to release the source code for your own + application in order to comply with the Oracle public + license, you may purchase a different license for use of + Berkeley DB Java Edition with JBossCache. For details, + please go to: + + http://www.oracle.com/database/berkeley-db/je/index.html + \ No newline at end of file Deleted: pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt =================================================================== --- pojo/trunk/src/main/release/licenses/README.txt 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -1,7 +0,0 @@ -This directory contains the licenses for some of the other libraries shipped with the distribution, that are not -covered by the LGPL-2.1 license. - -It is important to note that not all the libraries shipped are needed in all cases and if you do not use certain -libraries you may not come under some of the licenses in this directory. - -See README-libs.txt for details on the licenses attached to each library. Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt (from rev 4694, pojo/trunk/src/main/release/licenses/README.txt) =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt (rev 0) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/README.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -0,0 +1,7 @@ +This directory contains the licenses for some of the other libraries shipped with the distribution, that are not +covered by the LGPL-2.1 license. + +It is important to note that not all the libraries shipped are needed in all cases and if you do not use certain +libraries you may not come under some of the licenses in this directory. + +See README-libs.txt for details on the licenses attached to each library. Deleted: pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt =================================================================== --- pojo/trunk/src/main/release/licenses/apache-1.1.txt 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -1,58 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt (from rev 4694, pojo/trunk/src/main/release/licenses/apache-1.1.txt) =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt (rev 0) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-1.1.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -0,0 +1,58 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache(a)apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + * Portions of this software are based upon public domain software + * originally written at the National Center for Supercomputing Applications, + * University of Illinois, Urbana-Champaign. + */ + Deleted: pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt =================================================================== --- pojo/trunk/src/main/release/licenses/apache-2.0.txt 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt (from rev 4694, pojo/trunk/src/main/release/licenses/apache-2.0.txt) =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt (rev 0) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/apache-2.0.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. Deleted: pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt =================================================================== --- pojo/trunk/src/main/release/licenses/cpl-1.0.txt 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -1,213 +0,0 @@ -Common Public License Version 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial code and documentation - distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - - i) changes to the Program, and - - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and are - distributed by that particular Contributor. A Contribution 'originates' from - a Contributor if it was added to the Program by such Contributor itself or - anyone acting on such Contributor's behalf. Contributions do not include - additions to the Program which: (i) are separate modules of software - distributed in conjunction with the Program under their own license - agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including -all Contributors. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free copyright license to - reproduce, prepare derivative works of, publicly display, publicly perform, - distribute and sublicense the Contribution of such Contributor, if any, and - such derivative works, in source code and object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free patent license under - Licensed Patents to make, use, sell, offer to sell, import and otherwise - transfer the Contribution of such Contributor, if any, in source code and - object code form. This patent license shall apply to the combination of the - Contribution and the Program if, at the time the Contribution is added by - the Contributor, such addition of the Contribution causes such combination - to be covered by the Licensed Patents. The patent license shall not apply to - any other combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the licenses - to its Contributions set forth herein, no assurances are provided by any - Contributor that the Program does not infringe the patent or other - intellectual property rights of any other entity. Each Contributor disclaims - any liability to Recipient for claims brought by any other entity based on - infringement of intellectual property rights or otherwise. As a condition to - exercising the rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual property rights - needed, if any. For example, if a third party patent license is required to - allow Recipient to distribute the Program, it is Recipient's responsibility - to acquire that license before distributing the Program. - - d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright license - set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its -own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - - b) its license agreement: - - i) effectively disclaims on behalf of all Contributors all warranties and - conditions, express and implied, including warranties or conditions of title - and non-infringement, and implied warranties or conditions of merchantability - and fitness for a particular purpose; - - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and consequential - damages, such as lost profits; - - iii) states that any provisions which differ from this Agreement are offered - by that Contributor alone and not by any other party; and - - iv) states that source code for the Program is available from such Contributor, - and informs licensees how to obtain it in a reasonable manner on or through - a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - - b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product offering. -The obligations in this section do not apply to any claims or Losses relating to -any actual or alleged intellectual property infringement. In order to qualify, -an Indemnified Contributor must: a) promptly notify the Commercial Contributor -n writing of such claim, and b) allow the Commercial Contributor to control, -and cooperate with the Commercial Contributor in, the defense and any related -settlement negotiations. The Indemnified Contributor may participate in any such -claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such Commercial -Contributor's responsibility alone. Under this section, the Commercial -Contributor would have to defend claims against the other Contributors related -to those performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor must pay -those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using -and distributing the Program and assumes all risks associated with its exercise -of rights under this Agreement, including but not limited to the risks and costs -of program errors, compliance with applicable laws, damage to or loss of data, -programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY -WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such Recipient -under this Agreement shall terminate as of the date such litigation is filed. -In addition, if Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted under -Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply -with any of the material terms or conditions of this Agreement and does not cure -such failure in a reasonable period of time after becoming aware of such -noncompliance. If all Recipient's rights under this Agreement terminate, Recipient -agrees to cease use and distribution of the Program as soon as reasonably -practicable. However, Recipient's obligations under this Agreement and any -licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be modified -in the following manner. The Agreement Steward reserves the right to publish new -versions (including revisions) of this Agreement from time to time. No one other -than the Agreement Steward has the right to modify this Agreement. IBM is the -initial Agreement Steward. IBM may assign the responsibility to serve as the -Agreement Steward to a suitable separate entity. Each new version of the Agreement -will be given a distinguishing version number. The Program (including Contributions) -may always be distributed subject to the version of the Agreement under which it -was received. In addition, after a new version of the Agreement is published, -Contributor may elect to distribute the Program (including its Contributions) -under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, -Recipient receives no rights or licenses to the intellectual property of any -Contributor under this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this Agreement -are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year after -the cause of action arose. Each party waives its rights to a jury trial in any -resulting litigation. - Copied: pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt (from rev 4694, pojo/trunk/src/main/release/licenses/cpl-1.0.txt) =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt (rev 0) +++ pojo/tags/2.1.0.BETA1/src/main/release/licenses/cpl-1.0.txt 2007-10-26 14:42:30 UTC (rev 4696) @@ -0,0 +1,213 @@ +Common Public License Version 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial code and documentation + distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' from + a Contributor if it was added to the Program by such Contributor itself or + anyone acting on such Contributor's behalf. Contributions do not include + additions to the Program which: (i) are separate modules of software + distributed in conjunction with the Program under their own license + agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, including +all Contributors. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly perform, + distribute and sublicense the Contribution of such Contributor, if any, and + such derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of the + Contribution and the Program if, at the time the Contribution is added by + the Contributor, such addition of the Contribution causes such combination + to be covered by the Licensed Patents. The patent license shall not apply to + any other combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the licenses + to its Contributions set forth herein, no assurances are provided by any + Contributor that the Program does not infringe the patent or other + intellectual property rights of any other entity. Each Contributor disclaims + any liability to Recipient for claims brought by any other entity based on + infringement of intellectual property rights or otherwise. As a condition to + exercising the rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual property rights + needed, if any. For example, if a third party patent license is required to + allow Recipient to distribute the Program, it is Recipient's responsibility + to acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright license + set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all warranties and + conditions, express and implied, including warranties or conditions of title + and non-infringement, and implied warranties or conditions of merchantability + and fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and consequential + damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement are offered + by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from such Contributor, + and informs licensees how to obtain it in a reasonable manner on or through + a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product offering. +The obligations in this section do not apply to any claims or Losses relating to +any actual or alleged intellectual property infringement. In order to qualify, +an Indemnified Contributor must: a) promptly notify the Commercial Contributor +n writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any related +settlement negotiations. The Indemnified Contributor may participate in any such +claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such Commercial +Contributor's responsibility alone. Under this section, the Commercial +Contributor would have to defend claims against the other Contributors related +to those performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its exercise +of rights under this Agreement, including but not limited to the risks and costs +of program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to +a patent applicable to software (including a cross-claim or counterclaim in a +lawsuit), then any patent licenses granted by that Contributor to such Recipient +under this Agreement shall terminate as of the date such litigation is filed. +In addition, if Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply +with any of the material terms or conditions of this Agreement and does not cure +such failure in a reasonable period of time after becoming aware of such +noncompliance. If all Recipient's rights under this Agreement terminate, Recipient +agrees to cease use and distribution of the Program as soon as reasonably +practicable. However, Recipient's obligations under this Agreement and any +licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be modified +in the following manner. The Agreement Steward reserves the right to publish new +versions (including revisions) of this Agreement from time to time. No one other +than the Agreement Steward has the right to modify this Agreement. IBM is the +initial Agreement Steward. IBM may assign the responsibility to serve as the +Agreement Steward to a suitable separate entity. Each new version of the Agreement +will be given a distinguishing version number. The Program (including Contributions) +may always be distributed subject to the version of the Agreement under which it +was received. In addition, after a new version of the Agreement is published, +Contributor may elect to distribute the Program (including its Contributions) +under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, +Recipient receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this Agreement +are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year after +the cause of action arose. Each party waives its rights to a jury trial in any +resulting litigation. +

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4695 - pojo/trunk/assembly.

by jbosscache-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-10-26 10:39:54 -0400 (Fri, 26 Oct 2007) New Revision: 4695 Modified: pojo/trunk/assembly/all.xml pojo/trunk/assembly/bin.xml Log: Include license dir Modified: pojo/trunk/assembly/all.xml =================================================================== --- pojo/trunk/assembly/all.xml 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/trunk/assembly/all.xml 2007-10-26 14:39:54 UTC (rev 4695) @@ -47,8 +47,8 @@ <directory>src/main/release</directory> <outputDirectory/> <includes> - <include>*.txt</include> - <include>*.xml</include> + <include>**/*.txt</include> + <include>**/*.xml</include> </includes> </fileSet> Modified: pojo/trunk/assembly/bin.xml =================================================================== --- pojo/trunk/assembly/bin.xml 2007-10-26 14:37:33 UTC (rev 4694) +++ pojo/trunk/assembly/bin.xml 2007-10-26 14:39:54 UTC (rev 4695) @@ -28,8 +28,8 @@ <directory>src/main/release</directory> <outputDirectory/> <includes> - <include>*.txt</include> - <include>*.xml</include> + <include>**/*.txt</include> + <include>**/*.xml</include> </includes> </fileSet>

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r4694 - pojo/trunk/src/main/release.

by jbosscache-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-10-26 10:37:33 -0400 (Fri, 26 Oct 2007) New Revision: 4694 Added: pojo/trunk/src/main/release/licenses/ Modified: pojo/trunk/src/main/release/build.xml Log: Fix release issues Modified: pojo/trunk/src/main/release/build.xml =================================================================== --- pojo/trunk/src/main/release/build.xml 2007-10-26 13:06:27 UTC (rev 4693) +++ pojo/trunk/src/main/release/build.xml 2007-10-26 14:37:33 UTC (rev 4694) @@ -22,7 +22,7 @@  <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <taskdef name="testng" classpath="lib/test/testng.jar" classname="org.testng.TestNGAntTask"/> + <taskdef name="testng" classpath="lib/testng.jar" classname="org.testng.TestNGAntTask"/>  <path id="lib.classpath"> Copied: pojo/trunk/src/main/release/licenses (from rev 4620, core/trunk/src/main/release/licenses)

16 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits October 2007