[Mulgara-svn] r538 - in branches/mgr-73/src/jar: resolver/java/org/mulgara/resolver util/java/org/mulgara/util
andrae at mulgara.org
andrae at mulgara.org
Wed Nov 14 08:39:26 UTC 2007
Author: andrae
Date: 2007-11-14 02:39:26 -0600 (Wed, 14 Nov 2007)
New Revision: 538
Modified:
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java
Log:
Updates to the copyright and file headers.
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -16,9 +16,11 @@
* created by Plugged In Software Pty Ltd are Copyright (C) 2001,2002
* Plugged In Software Pty Ltd. All Rights Reserved.
*
- * Contributor(s): N/A.
+ * Contributor(s):
* SymbolicTransformation refactor contributed by Netymon Pty Ltd on behalf of
* The Australian Commonwealth Government under contract 4500507038.
+ * External XAResource contributed by Netymon Pty Ltd on behalf of Topaz
+ * Foundation under contract.
*
* [NOTE: The text of this Exhibit A may differ slightly from the text
* of the notices in the Source Code files of the Original Code. You
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -10,8 +10,9 @@
* under the License.
*
* This file is an original work developed by Netymon Pty Ltd
- * (http://www.netymon.com, mailto:mail at netymon.com). Portions created
- * by Netymon Pty Ltd are Copyright (c) 2007 Netymon Pty Ltd.
+ * (http://www.netymon.com, mailto:mail at netymon.com) under contract to
+ * Topaz Foundation. Portions created under this contract are
+ * Copyright (c) 2007 Topaz Foundation
* All Rights Reserved.
*/
package org.mulgara.resolver;
@@ -35,15 +36,9 @@
*
* @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
*
- * @version $Revision: $
- *
- * @modified $Date: $
- *
- * @maintenanceAuthor $Author: $
- *
* @company <a href="mailto:mail at netymon.com">Netymon Pty Ltd</a>
*
- * @copyright ©2007 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
+ * @copyright ©2007 <a href="http://www.topazproject.org/">Topaz Foundation</a>
*
* @licence Open Software License v3.0
*/
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -10,8 +10,9 @@
* under the License.
*
* This file is an original work developed by Netymon Pty Ltd
- * (http://www.netymon.com, mailto:mail at netymon.com). Portions created
- * by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
+ * (http://www.netymon.com, mailto:mail at netymon.com) under contract to
+ * Topaz Foundation. Portions created under this contract are
+ * Copyright (c) 2007 Topaz Foundation
* All Rights Reserved.
*/
@@ -19,15 +20,7 @@
// Java2 packages
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
import javax.transaction.xa.XAResource;
// Third party packages
@@ -35,34 +28,18 @@
// Local packages
import org.mulgara.query.MulgaraTransactionException;
-import org.mulgara.server.Session;
import org.mulgara.transaction.TransactionManagerFactory;
/**
- * Manages transactions within Mulgara.
+ * Manages external transactions.
*
- * see http://mulgara.org/confluence/display/dev/Transaction+Architecture
+ * @created 2007-11-06
*
- * Maintains association between Answer's and TransactionContext's.
- * Manages tracking the ownership of the write-lock.
- * Maintains the write-queue and any timeout algorithm desired.
- * Provides new/existing TransactionContext's to DatabaseSession on request.
- * Note: Returns new context unless Session is currently in a User Demarcated Transaction.
- *
- *
- * @created 2006-10-06
- *
* @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
*
- * @version $Revision: $
- *
- * @modified $Date: $
- *
- * @maintenanceAuthor $Author: $
- *
* @company <A href="mailto:mail at netymon.com">Netymon Pty Ltd</A>
*
- * @copyright ©2006 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
+ * @copyright ©2007 <a href="http://www.topazproject.org/">Topaz Foundation</a>
*
* @licence Open Software License v3.0</a>
*/
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -13,6 +13,9 @@
* (http://www.netymon.com, mailto:mail at netymon.com). Portions created
* by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
* All Rights Reserved.
+ *
+ * Work deriving from MulgaraTransaction Copyright (c) 2007 Topaz Foundation
+ * under contract by Andrae Muys (mailto:andrae at netymon.com).
*/
package org.mulgara.resolver;
@@ -51,12 +54,6 @@
*
* @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
*
- * @version $Revision: $
- *
- * @modified $Date: $
- *
- * @maintenanceAuthor $Author: $
- *
* @company <a href="mailto:mail at netymon.com">Netymon Pty Ltd</a>
*
* @copyright ©2006 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -13,6 +13,9 @@
* (http://www.netymon.com, mailto:mail at netymon.com). Portions created
* by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
* All Rights Reserved.
+ *
+ * Work deriving from MulgaraTransactionManager Copyright (c) 2007 Topaz
+ * Foundation under contract by Andrae Muys (mailto:andrae at netymon.com).
*/
package org.mulgara.resolver;
@@ -39,27 +42,12 @@
import org.mulgara.transaction.TransactionManagerFactory;
/**
- * Manages transactions within Mulgara.
+ * Implements the internal transaction controls offered by Session.
*
- * see http://mulgara.org/confluence/display/dev/Transaction+Architecture
- *
- * Maintains association between Answer's and TransactionContext's.
- * Manages tracking the ownership of the write-lock.
- * Maintains the write-queue and any timeout algorithm desired.
- * Provides new/existing TransactionContext's to DatabaseSession on request.
- * Note: Returns new context unless Session is currently in a User Demarcated Transaction.
- *
- *
* @created 2006-10-06
*
* @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
*
- * @version $Revision: $
- *
- * @modified $Date: $
- *
- * @maintenanceAuthor $Author: $
- *
* @company <A href="mailto:mail at netymon.com">Netymon Pty Ltd</A>
*
* @copyright ©2006 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -13,6 +13,9 @@
* (http://www.netymon.com, mailto:mail at netymon.com). Portions created
* by Netymon Pty Ltd are Copyright (c) 2007 Netymon Pty Ltd.
* All Rights Reserved.
+ *
+ * Migration to interface Copyright (c) 2007 Topaz Foundation
+ * under contract by Andrae Muys (mailto:andrae at netymon.com).
*/
package org.mulgara.resolver;
@@ -47,7 +50,7 @@
*
* @licence Open Software License v3.0
*/
-public class MulgaraTransaction {
+public interface MulgaraTransaction {
void reference() throws MulgaraTransactionException;
void dereference() throws MulgaraTransactionException;
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -13,6 +13,9 @@
* (http://www.netymon.com, mailto:mail at netymon.com). Portions created
* by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
* All Rights Reserved.
+ *
+ * Derivation from MulgaraTransactionManager Copyright (c) 2007 Topaz
+ * Foundation under contract by Andrae Muys (mailto:andrae at netymon.com).
*/
package org.mulgara.resolver;
@@ -49,17 +52,10 @@
* Provides new/existing TransactionContext's to DatabaseSession on request.
* Note: Returns new context unless Session is currently in a User Demarcated Transaction.
*
- *
* @created 2006-10-06
*
* @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
*
- * @version $Revision: $
- *
- * @modified $Date: $
- *
- * @maintenanceAuthor $Author: $
- *
* @company <A href="mailto:mail at netymon.com">Netymon Pty Ltd</A>
*
* @copyright ©2006 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -13,6 +13,10 @@
* (http://www.netymon.com, mailto:mail at netymon.com). Portions created
* by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
* All Rights Reserved.
+ *
+ * Contributor(s):
+ * Refactoring to focus on write-lock management contributed by Netymon
+ * Pty Ltd on behalf of Topaz Foundation under contract.
*/
package org.mulgara.resolver;
@@ -34,10 +38,8 @@
import org.mulgara.transaction.TransactionManagerFactory;
/**
- * Manages transactions within Mulgara.
+ * Manages the Write-Lock.
*
- * see http://mulgara.org/confluence/display/dev/Transaction+Architecture
- *
* Manages tracking the ownership of the write-lock.
* Provides new/existing TransactionContext's to DatabaseSession on request.
* Note: Returns new context unless Session is currently in a User Demarcated Transaction.
Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -10,8 +10,9 @@
* under the License.
*
* This file is an original work developed by Netymon Pty Ltd
- * (http://www.netymon.com, mailto:mail at netymon.com). Portions created
- * by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
+ * (http://www.netymon.com, mailto:mail at netymon.com) under contract to
+ * Topaz Foundation. Portions created under this contract are
+ * Copyright (c) 2007 Topaz Foundation
* All Rights Reserved.
*/
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java 2007-11-14 08:15:58 UTC (rev 537)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java 2007-11-14 08:39:26 UTC (rev 538)
@@ -10,8 +10,9 @@
* under the License.
*
* This file is an original work developed by Netymon Pty Ltd
- * (http://www.netymon.com, mailto:mail at netymon.com). Portions created
- * by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
+ * (http://www.netymon.com, mailto:mail at netymon.com) under contract to
+ * Topaz Foundation. Portions created under this contract are
+ * Copyright (c) 2007 Topaz Foundation
* All Rights Reserved.
*/
@@ -23,6 +24,8 @@
import java.util.Set;
/**
+ * A 1:N Associative Map.
+ *
* @created 2007-11-12
*
* @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
More information about the Mulgara-svn
mailing list