diff options
18 files changed, 668 insertions, 126 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0805e31..397ef69 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,23 @@ +2002-11-26 Mark Wielaard <mark@klomp.org> + + * javax/transaction/HeuristicCommitException.java: Classpath merge. + * javax/transaction/HeuristicMixedException.java: Likewise. + * javax/transaction/HeuristicRollbackException.java: Likewise. + * javax/transaction/InvalidTransactionException.java: Likewise. + * javax/transaction/NotSupportedException.java: Likewise. + * javax/transaction/RollbackException.java: Likewise. + * javax/transaction/Status.java: Likewise. + * javax/transaction/Synchronization.java: Likewise. + * javax/transaction/SystemException.java: Likewise. + * javax/transaction/Transaction.java: Likewise. + * javax/transaction/TransactionManager.java: Likewise. + * javax/transaction/TransactionRequiredException.java: Likewise. + * javax/transaction/TransactionRolledbackException.java: Likewise. + * javax/transaction/UserTransaction.java: Likewise. + * javax/transaction/xa/XAException.java: Likewise. + * javax/transaction/xa/XAResource.java: Likewise. + * javax/transaction/xa/Xid.java: Likewise. + 2002-11-26 Andreas Tobler <a.tobler@schweiz.ch> * java/net/natPlainDatagramSocketImpl.cc (socklen_t): Don't diff --git a/libjava/javax/transaction/HeuristicCommitException.java b/libjava/javax/transaction/HeuristicCommitException.java index 0646a23..e1ef8e2 100644 --- a/libjava/javax/transaction/HeuristicCommitException.java +++ b/libjava/javax/transaction/HeuristicCommitException.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* HeuristicCommitException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public class HeuristicCommitException extends java.lang.Exception +public class HeuristicCommitException extends Exception { public HeuristicCommitException () { diff --git a/libjava/javax/transaction/HeuristicMixedException.java b/libjava/javax/transaction/HeuristicMixedException.java index f351da3..68986b6 100644 --- a/libjava/javax/transaction/HeuristicMixedException.java +++ b/libjava/javax/transaction/HeuristicMixedException.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* HeuristicMixedException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public class HeuristicMixedException extends java.lang.Exception +public class HeuristicMixedException extends Exception { public HeuristicMixedException () { diff --git a/libjava/javax/transaction/HeuristicRollbackException.java b/libjava/javax/transaction/HeuristicRollbackException.java index 7ad3782..72ac3b4 100644 --- a/libjava/javax/transaction/HeuristicRollbackException.java +++ b/libjava/javax/transaction/HeuristicRollbackException.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* HeuristicRollbackException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public class HeuristicRollbackException extends java.lang.Exception +public class HeuristicRollbackException extends Exception { public HeuristicRollbackException () { diff --git a/libjava/javax/transaction/InvalidTransactionException.java b/libjava/javax/transaction/InvalidTransactionException.java index f5bb718..0c47912 100644 --- a/libjava/javax/transaction/InvalidTransactionException.java +++ b/libjava/javax/transaction/InvalidTransactionException.java @@ -1,11 +1,40 @@ -/* Copyright (C) 2001 Free Software Foundation +/* InvalidTransactionException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. - This file is part of libgcj. +This file is part of GNU Classpath. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package javax.transaction; import java.rmi.RemoteException; diff --git a/libjava/javax/transaction/NotSupportedException.java b/libjava/javax/transaction/NotSupportedException.java index 767babb..b239574 100644 --- a/libjava/javax/transaction/NotSupportedException.java +++ b/libjava/javax/transaction/NotSupportedException.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* NotSupportedException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public class NotSupportedException extends java.lang.Exception +public class NotSupportedException extends Exception { public NotSupportedException () { diff --git a/libjava/javax/transaction/RollbackException.java b/libjava/javax/transaction/RollbackException.java index 7bc77ee..c8706f5 100644 --- a/libjava/javax/transaction/RollbackException.java +++ b/libjava/javax/transaction/RollbackException.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* RollbackException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public class RollbackException extends java.lang.Exception +public class RollbackException extends Exception { public RollbackException () { diff --git a/libjava/javax/transaction/Status.java b/libjava/javax/transaction/Status.java index 84f1e7c..7068602 100644 --- a/libjava/javax/transaction/Status.java +++ b/libjava/javax/transaction/Status.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* Status.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public abstract interface Status +public interface Status { public static final int STATUS_ACTIVE = 0; public static final int STATUS_MARKED_ROLLBACK = 1; diff --git a/libjava/javax/transaction/Synchronization.java b/libjava/javax/transaction/Synchronization.java index 046f64d..7a1dfa5 100644 --- a/libjava/javax/transaction/Synchronization.java +++ b/libjava/javax/transaction/Synchronization.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* Synchronization.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public abstract interface Synchronization +public interface Synchronization { public void beforeCompletion(); public void afterCompletion(int status); diff --git a/libjava/javax/transaction/SystemException.java b/libjava/javax/transaction/SystemException.java index e279aca..ed9c9e4 100644 --- a/libjava/javax/transaction/SystemException.java +++ b/libjava/javax/transaction/SystemException.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* SystemException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,7 +43,7 @@ package javax.transaction; * @date May 25, 2001 */ -public class SystemException extends java.lang.Exception +public class SystemException extends Exception { public int errorCode; diff --git a/libjava/javax/transaction/Transaction.java b/libjava/javax/transaction/Transaction.java index 632707c..11aca01 100644 --- a/libjava/javax/transaction/Transaction.java +++ b/libjava/javax/transaction/Transaction.java @@ -1,12 +1,43 @@ -/* Copyright (C) 2001 Free Software Foundation +/* Transaction.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; + import javax.transaction.xa.XAResource; /** @@ -14,20 +45,26 @@ import javax.transaction.xa.XAResource; * @date May 25, 2001 */ -public abstract interface Transaction +public interface Transaction { public void commit() throws RollbackException, HeuristicMixedException, - HeuristicRollbackException, java.lang.SecurityException, SystemException; + HeuristicRollbackException, SecurityException, SystemException; + public boolean delistResource(XAResource xaRes, int flag) - throws java.lang.IllegalStateException, SystemException; + throws IllegalStateException, SystemException; + public boolean enlistResource(XAResource xaRes) - throws RollbackException, java.lang.IllegalStateException, SystemException; + throws RollbackException, IllegalStateException, SystemException; + public int getStatus() throws SystemException; + public void registerSynchronization(Synchronization sync) - throws RollbackException, java.lang.IllegalStateException, SystemException; + throws RollbackException, IllegalStateException, SystemException; + public void rollback() - throws java.lang.IllegalStateException, SystemException; + throws IllegalStateException, SystemException; + public void setRollbackOnly() - throws java.lang.IllegalStateException, SystemException; + throws IllegalStateException, SystemException; } diff --git a/libjava/javax/transaction/TransactionManager.java b/libjava/javax/transaction/TransactionManager.java index 9f5f57c..e0501af 100644 --- a/libjava/javax/transaction/TransactionManager.java +++ b/libjava/javax/transaction/TransactionManager.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* TransactionManager.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,23 +43,30 @@ package javax.transaction; * @date May 25, 2001 */ -public abstract interface TransactionManager +public interface TransactionManager { public void begin() throws NotSupportedException, SystemException; + public void commit() throws RollbackException, HeuristicMixedException, - HeuristicRollbackException, java.lang.SecurityException, - java.lang.IllegalStateException, SystemException; + HeuristicRollbackException, SecurityException, + IllegalStateException, SystemException; + public int getStatus() throws SystemException; + public Transaction getTransaction() throws SystemException; + public void resume(Transaction tobj) - throws InvalidTransactionException, java.lang.IllegalStateException, + throws InvalidTransactionException, IllegalStateException, SystemException; + public void rollback() - throws java.lang.IllegalStateException, java.lang.SecurityException, - SystemException; + throws IllegalStateException, SecurityException, SystemException; + public void setRollbackOnly() - throws java.lang.IllegalStateException, SystemException; + throws IllegalStateException, SystemException; + public void setTransactionTimeout(int seconds) throws SystemException; + public Transaction suspend() throws SystemException; } diff --git a/libjava/javax/transaction/TransactionRequiredException.java b/libjava/javax/transaction/TransactionRequiredException.java index e845a9f..ebc5679 100644 --- a/libjava/javax/transaction/TransactionRequiredException.java +++ b/libjava/javax/transaction/TransactionRequiredException.java @@ -1,11 +1,40 @@ -/* Copyright (C) 2001 Free Software Foundation +/* TransactionRequiredException -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. - This file is part of libgcj. +This file is part of GNU Classpath. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package javax.transaction; import java.rmi.RemoteException; diff --git a/libjava/javax/transaction/TransactionRolledbackException.java b/libjava/javax/transaction/TransactionRolledbackException.java index 96dd8dd..ef4f1cc 100644 --- a/libjava/javax/transaction/TransactionRolledbackException.java +++ b/libjava/javax/transaction/TransactionRolledbackException.java @@ -1,11 +1,40 @@ -/* Copyright (C) 2001 Free Software Foundation +/* TransactionRolledbackException -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. - This file is part of libgcj. +This file is part of GNU Classpath. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package javax.transaction; import java.rmi.RemoteException; diff --git a/libjava/javax/transaction/UserTransaction.java b/libjava/javax/transaction/UserTransaction.java index eb02a6c..fe8aad7 100644 --- a/libjava/javax/transaction/UserTransaction.java +++ b/libjava/javax/transaction/UserTransaction.java @@ -1,11 +1,41 @@ -/* Copyright (C) 2001 Free Software Foundation +/* UserTransaction.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ - This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - package javax.transaction; /** @@ -13,18 +43,22 @@ package javax.transaction; * @date May 25, 2001 */ -public abstract interface UserTransaction +public interface UserTransaction { public void begin() throws NotSupportedException, SystemException; + public void commit() throws RollbackException, HeuristicMixedException, - HeuristicRollbackException, java.lang.SecurityException, - java.lang.IllegalStateException, SystemException; + HeuristicRollbackException, SecurityException, + IllegalStateException, SystemException; + public void rollback() - throws java.lang.IllegalStateException, java.lang.SecurityException, - SystemException; + throws IllegalStateException, SecurityException, SystemException; + public void setRollbackOnly() - throws java.lang.IllegalStateException, SystemException; + throws IllegalStateException, SystemException; + public int getStatus() throws SystemException; + public void setTransactionTimeout(int seconds) throws SystemException; } diff --git a/libjava/javax/transaction/xa/XAException.java b/libjava/javax/transaction/xa/XAException.java index 43ede1d..48c7ca8 100644 --- a/libjava/javax/transaction/xa/XAException.java +++ b/libjava/javax/transaction/xa/XAException.java @@ -1,11 +1,40 @@ -/* Copyright (C) 2001 Free Software Foundation +/* XAException.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. - This file is part of libgcj. +This file is part of GNU Classpath. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package javax.transaction.xa; /** diff --git a/libjava/javax/transaction/xa/XAResource.java b/libjava/javax/transaction/xa/XAResource.java index 226850c..038923f 100644 --- a/libjava/javax/transaction/xa/XAResource.java +++ b/libjava/javax/transaction/xa/XAResource.java @@ -1,11 +1,40 @@ -/* Copyright (C) 2001 Free Software Foundation +/* XAResource.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. - This file is part of libgcj. +This file is part of GNU Classpath. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package javax.transaction.xa; /** @@ -13,7 +42,7 @@ package javax.transaction.xa; * @date May 25, 2001 */ -public abstract interface XAResource +public interface XAResource { public static final int TMENDRSCAN = 8388608; public static final int TMFAIL = 536870912; diff --git a/libjava/javax/transaction/xa/Xid.java b/libjava/javax/transaction/xa/Xid.java index 2edf0c5..d509ccf 100644 --- a/libjava/javax/transaction/xa/Xid.java +++ b/libjava/javax/transaction/xa/Xid.java @@ -1,11 +1,40 @@ -/* Copyright (C) 2001 Free Software Foundation +/* Xid.java -- + Copyright (C) 2001, 2002 Free Software Foundation, Inc. - This file is part of libgcj. +This file is part of GNU Classpath. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package javax.transaction.xa; /** @@ -13,7 +42,7 @@ package javax.transaction.xa; * @date May 25, 2001 */ -public abstract interface Xid +public interface Xid { public static final int MAXGTRIDSIZE = 64; public static final int MAXBQUALSIZE = 64; |