tomdz 2005/12/21 14:25:32
Modified: src/java/org/apache/ojb/broker/core/proxy Tag:
OJB_1_0_RELEASE OJBProxy.java
AbstractProxyFactory.java
CollectionProxyDefaultImpl.java
ProxyConfiguration.java OJBSerializableProxy.java
IndirectionHandlerJDKImpl.java
AbstractIndirectionHandler.java VirtualProxy.java
MaterializationListener.java
IndirectionHandlerCGLIBImpl.java
CollectionProxy.java SetProxyDefaultImpl.java
IndirectionHandlerJDK.java ProxyFactoryJDKImpl.java
IndirectionHandler.java
CollectionProxyListener.java
ProxyFactoryCGLIBImpl.java ProxyHelper.java
ListProxyDefaultImpl.java ProxyFactory.java
IndirectionHandlerCGLIB.java
src/java/org/apache/ojb/broker/locking Tag: OJB_1_0_RELEASE
LockRuntimeException.java
LockManagerInMemoryImpl.java IsolationLevels.java
LockIsolationManager.java LockIsolation.java
LockManagerCommonsImpl.java
CommonsOJBLockManager.java LockManager.java
LockManagerServlet.java LockManagerRemoteImpl.java
LockHelper.java
Log:
Updated license
Revision Changes Path
No revision
No revision
1.2.2.3 +3 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/OJBProxy.java
Index: OJBProxy.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/OJBProxy.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- OJBProxy.java 17 Aug 2005 21:19:39 -0000 1.2.2.2
+++ OJBProxy.java 21 Dec 2005 22:25:30 -0000 1.2.2.3
@@ -1,6 +1,6 @@
-
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* @author andrew.clute
* Marker interface that all dynamically generated proxies implement
1.2.2.4 +1 -1
db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractProxyFactory.java
Index: AbstractProxyFactory.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractProxyFactory.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- AbstractProxyFactory.java 10 Oct 2005 00:38:24 -0000 1.2.2.3
+++ AbstractProxyFactory.java 21 Dec 2005 22:25:30 -0000 1.2.2.4
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.7.2.7 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxyDefaultImpl.java
Index: CollectionProxyDefaultImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxyDefaultImpl.java,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -r1.7.2.6 -r1.7.2.7
--- CollectionProxyDefaultImpl.java 22 Mar 2005 15:43:30 -0000 1.7.2.6
+++ CollectionProxyDefaultImpl.java 21 Dec 2005 22:25:30 -0000 1.7.2.7
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.2.2.2 +1 -1
db-ojb/src/java/org/apache/ojb/broker/core/proxy/Attic/ProxyConfiguration.java
Index: ProxyConfiguration.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/Attic/ProxyConfiguration.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ProxyConfiguration.java 9 Aug 2005 20:03:21 -0000 1.2.2.1
+++ ProxyConfiguration.java 21 Dec 2005 22:25:30 -0000 1.2.2.2
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.3 +16 -14
db-ojb/src/java/org/apache/ojb/broker/core/proxy/Attic/OJBSerializableProxy.java
Index: OJBSerializableProxy.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/Attic/OJBSerializableProxy.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- OJBSerializableProxy.java 24 Aug 2005 14:48:56 -0000 1.1.2.2
+++ OJBSerializableProxy.java 21 Dec 2005 22:25:30 -0000 1.1.2.3
@@ -1,18 +1,20 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
-*
-* 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.
-*/
+
+/* Copyright 2002-2005 The Apache Software Foundation
+ *
+ * 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.
+ */
+
import java.io.ObjectStreamException;
import java.io.Serializable;
1.1.2.2 +2 -1
db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerJDKImpl.java
Index: IndirectionHandlerJDKImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerJDKImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IndirectionHandlerJDKImpl.java 9 Aug 2005 20:03:20 -0000 1.1.2.1
+++ IndirectionHandlerJDKImpl.java 21 Dec 2005 22:25:30 -0000 1.1.2.2
@@ -1,5 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.5 +1 -1
db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractIndirectionHandler.java
Index: AbstractIndirectionHandler.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractIndirectionHandler.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractIndirectionHandler.java 28 Sep 2005 00:30:23 -0000 1.1.2.4
+++ AbstractIndirectionHandler.java 21 Dec 2005 22:25:30 -0000 1.1.2.5
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.6 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/VirtualProxy.java
Index: VirtualProxy.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/VirtualProxy.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- VirtualProxy.java 29 Sep 2005 17:21:19 -0000 1.1.2.5
+++ VirtualProxy.java 21 Dec 2005 22:25:30 -0000 1.1.2.6
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/MaterializationListener.java
Index: MaterializationListener.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/MaterializationListener.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- MaterializationListener.java 9 Apr 2004 13:22:29 -0000 1.1
+++ MaterializationListener.java 21 Dec 2005 22:25:30 -0000 1.1.2.1
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerCGLIBImpl.java
Index: IndirectionHandlerCGLIBImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerCGLIBImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IndirectionHandlerCGLIBImpl.java 9 Aug 2005 20:03:21 -0000 1.1.2.1
+++ IndirectionHandlerCGLIBImpl.java 21 Dec 2005 22:25:30 -0000 1.1.2.2
@@ -1,6 +1,6 @@
-
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+
+/* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.1 +15 -0
db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxy.java
Index: CollectionProxy.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxy.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- CollectionProxy.java 10 Jun 2004 14:40:08 -0000 1.1
+++ CollectionProxy.java 21 Dec 2005 22:25:30 -0000 1.1.2.1
@@ -1,5 +1,20 @@
package org.apache.ojb.broker.core.proxy;
+/* Copyright 2002-2005 The Apache Software Foundation
+ *
+ * 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.
+ */
+
/**
* Interface which Collection proxies need to implement to be
* treated like collection proxies in ODMG.
1.1.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/SetProxyDefaultImpl.java
Index: SetProxyDefaultImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/SetProxyDefaultImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- SetProxyDefaultImpl.java 9 Apr 2004 13:22:29 -0000 1.1
+++ SetProxyDefaultImpl.java 21 Dec 2005 22:25:30 -0000 1.1.2.1
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +16 -14
db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerJDK.java
Index: IndirectionHandlerJDK.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerJDK.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IndirectionHandlerJDK.java 9 Aug 2005 20:03:21 -0000 1.1.2.1
+++ IndirectionHandlerJDK.java 21 Dec 2005 22:25:30 -0000 1.1.2.2
@@ -1,18 +1,20 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
-*
-* 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.
-*/
+
+/* Copyright 2002-2005 The Apache Software Foundation
+ *
+ * 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.
+ */
+
//#ifdef JDK13
import java.lang.reflect.InvocationHandler;
//#else
1.2.2.3 +1 -1
db-ojb/src/java/org/apache/ojb/broker/core/proxy/ProxyFactoryJDKImpl.java
Index: ProxyFactoryJDKImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/ProxyFactoryJDKImpl.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ProxyFactoryJDKImpl.java 12 Aug 2005 13:49:21 -0000 1.2.2.2
+++ ProxyFactoryJDKImpl.java 21 Dec 2005 22:25:30 -0000 1.2.2.3
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.2.2.2 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandler.java
Index: IndirectionHandler.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandler.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- IndirectionHandler.java 9 Aug 2005 20:03:20 -0000 1.2.2.1
+++ IndirectionHandler.java 21 Dec 2005 22:25:30 -0000 1.2.2.2
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxyListener.java
Index: CollectionProxyListener.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxyListener.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- CollectionProxyListener.java 9 Apr 2004 13:22:29 -0000 1.1
+++ CollectionProxyListener.java 21 Dec 2005 22:25:30 -0000 1.1.2.1
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.2.2.3 +1 -1
db-ojb/src/java/org/apache/ojb/broker/core/proxy/ProxyFactoryCGLIBImpl.java
Index: ProxyFactoryCGLIBImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/ProxyFactoryCGLIBImpl.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ProxyFactoryCGLIBImpl.java 12 Aug 2005 13:49:21 -0000 1.2.2.2
+++ ProxyFactoryCGLIBImpl.java 21 Dec 2005 22:25:31 -0000 1.2.2.3
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.2.2.8 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/Attic/ProxyHelper.java
Index: ProxyHelper.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/Attic/ProxyHelper.java,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- ProxyHelper.java 10 Oct 2005 00:38:24 -0000 1.2.2.7
+++ ProxyHelper.java 21 Dec 2005 22:25:31 -0000 1.2.2.8
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/ListProxyDefaultImpl.java
Index: ListProxyDefaultImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/ListProxyDefaultImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ListProxyDefaultImpl.java 9 Apr 2004 13:22:29 -0000 1.1
+++ ListProxyDefaultImpl.java 21 Dec 2005 22:25:31 -0000 1.1.2.1
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.3 +2 -2
db-ojb/src/java/org/apache/ojb/broker/core/proxy/ProxyFactory.java
Index: ProxyFactory.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/ProxyFactory.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ProxyFactory.java 12 Aug 2005 13:49:21 -0000 1.1.2.2
+++ ProxyFactory.java 21 Dec 2005 22:25:31 -0000 1.1.2.3
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +16 -15
db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerCGLIB.java
Index: IndirectionHandlerCGLIB.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/IndirectionHandlerCGLIB.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IndirectionHandlerCGLIB.java 9 Aug 2005 20:03:21 -0000 1.1.2.1
+++ IndirectionHandlerCGLIB.java 21 Dec 2005 22:25:31 -0000 1.1.2.2
@@ -1,19 +1,20 @@
-
package org.apache.ojb.broker.core.proxy;
-/* Copyright 2002-2004 The Apache Software Foundation
-*
-* 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.
-*/
+
+/* Copyright 2005 The Apache Software Foundation
+ *
+ * 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.
+ */
+
import net.sf.cglib.proxy.InvocationHandler;
/**
No revision
No revision
1.1.2.2 +4 -4
db-ojb/src/java/org/apache/ojb/broker/locking/LockRuntimeException.java
Index: LockRuntimeException.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockRuntimeException.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockRuntimeException.java 23 Jan 2005 03:07:32 -0000 1.1.2.1
+++ LockRuntimeException.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,8 +1,6 @@
package org.apache.ojb.broker.locking;
-import org.apache.ojb.broker.OJBRuntimeException;
-
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +15,8 @@
* limitations under the License.
*/
+import org.apache.ojb.broker.OJBRuntimeException;
+
/**
* Exception was thrown when unexpected behavior in conjunction with locking
* was detected.
1.1.2.3 +2 -2
db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java
Index: LockManagerInMemoryImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LockManagerInMemoryImpl.java 24 Mar 2005 17:57:30 -0000 1.1.2.2
+++ LockManagerInMemoryImpl.java 21 Dec 2005 22:25:32 -0000 1.1.2.3
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.3 +2 -2
db-ojb/src/java/org/apache/ojb/broker/locking/IsolationLevels.java
Index: IsolationLevels.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/IsolationLevels.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- IsolationLevels.java 22 Mar 2005 14:42:48 -0000 1.1.2.2
+++ IsolationLevels.java 21 Dec 2005 22:25:32 -0000 1.1.2.3
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +2 -2
db-ojb/src/java/org/apache/ojb/broker/locking/LockIsolationManager.java
Index: LockIsolationManager.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockIsolationManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockIsolationManager.java 19 Feb 2005 21:49:53 -0000 1.1.2.1
+++ LockIsolationManager.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +1 -1
db-ojb/src/java/org/apache/ojb/broker/locking/LockIsolation.java
Index: LockIsolation.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockIsolation.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockIsolation.java 19 Feb 2005 21:49:53 -0000 1.1.2.1
+++ LockIsolation.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +10 -10
db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerCommonsImpl.java
Index: LockManagerCommonsImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerCommonsImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockManagerCommonsImpl.java 19 Feb 2005 21:49:53 -0000 1.1.2.1
+++ LockManagerCommonsImpl.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,14 +1,6 @@
package org.apache.ojb.broker.locking;
-import org.apache.commons.lang.SystemUtils;
-import org.apache.commons.transaction.locking.GenericLock;
-import org.apache.commons.transaction.locking.GenericLockManager;
-import org.apache.commons.transaction.locking.LockException;
-import org.apache.commons.transaction.util.LoggerFacade;
-import org.apache.ojb.broker.util.logging.Logger;
-import org.apache.ojb.broker.util.logging.LoggerFactory;
-
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +15,14 @@
* limitations under the License.
*/
+import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.transaction.locking.GenericLock;
+import org.apache.commons.transaction.locking.GenericLockManager;
+import org.apache.commons.transaction.locking.LockException;
+import org.apache.commons.transaction.util.LoggerFacade;
+import org.apache.ojb.broker.util.logging.Logger;
+import org.apache.ojb.broker.util.logging.LoggerFactory;
+
/**
* A [EMAIL PROTECTED] LockManager} implementation based on apache's
commons-transaction
* locking part.
1.1.2.4 +8 -8
db-ojb/src/java/org/apache/ojb/broker/locking/CommonsOJBLockManager.java
Index: CommonsOJBLockManager.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/CommonsOJBLockManager.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CommonsOJBLockManager.java 16 Aug 2005 15:11:32 -0000 1.1.2.3
+++ CommonsOJBLockManager.java 21 Dec 2005 22:25:32 -0000 1.1.2.4
@@ -1,12 +1,6 @@
package org.apache.ojb.broker.locking;
-import org.apache.commons.transaction.locking.GenericLock;
-import org.apache.commons.transaction.locking.GenericLockManager;
-import org.apache.commons.transaction.locking.LockException;
-import org.apache.commons.transaction.locking.MultiLevelLock;
-import org.apache.commons.transaction.util.LoggerFacade;
-
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +15,12 @@
* limitations under the License.
*/
+import org.apache.commons.transaction.locking.GenericLock;
+import org.apache.commons.transaction.locking.GenericLockManager;
+import org.apache.commons.transaction.locking.LockException;
+import org.apache.commons.transaction.locking.MultiLevelLock;
+import org.apache.commons.transaction.util.LoggerFacade;
+
/**
* Extension of [EMAIL PROTECTED]
org.apache.commons.transaction.locking.GenericLockManager} to
* support all locking isolation level defined in OJB locking api and a
provider of
1.1.2.5 +2 -2
db-ojb/src/java/org/apache/ojb/broker/locking/LockManager.java
Index: LockManager.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockManager.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- LockManager.java 19 Feb 2005 21:49:53 -0000 1.1.2.4
+++ LockManager.java 21 Dec 2005 22:25:32 -0000 1.1.2.5
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +1 -1
db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerServlet.java
Index: LockManagerServlet.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerServlet.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockManagerServlet.java 19 Feb 2005 21:49:53 -0000 1.1.2.1
+++ LockManagerServlet.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +2 -2
db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerRemoteImpl.java
Index: LockManagerRemoteImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerRemoteImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockManagerRemoteImpl.java 19 Feb 2005 21:49:53 -0000 1.1.2.1
+++ LockManagerRemoteImpl.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,6 +1,6 @@
package org.apache.ojb.broker.locking;
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
1.1.2.2 +5 -5
db-ojb/src/java/org/apache/ojb/broker/locking/Attic/LockHelper.java
Index: LockHelper.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/locking/Attic/LockHelper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LockHelper.java 19 Feb 2005 21:49:53 -0000 1.1.2.1
+++ LockHelper.java 21 Dec 2005 22:25:32 -0000 1.1.2.2
@@ -1,9 +1,6 @@
package org.apache.ojb.broker.locking;
-import org.apache.ojb.broker.util.logging.LoggerFactory;
-import org.apache.commons.lang.StringUtils;
-
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +15,9 @@
* limitations under the License.
*/
+import org.apache.ojb.broker.util.logging.LoggerFactory;
+import org.apache.commons.lang.StringUtils;
+
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Armin Waibel</a>
* @version $Id$
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
