Deleted: trunk/openejb2/modules/core/src/java/org/openejb/EjbInvocationImplRemote.java (2445 => 2446)
--- trunk/openejb2/modules/core/src/java/org/openejb/EjbInvocationImplRemote.java 2006-02-15 01:03:19 UTC (rev 2445)
+++ trunk/openejb2/modules/core/src/java/org/openejb/EjbInvocationImplRemote.java 2006-02-16 04:04:55 UTC (rev 2446)
@@ -1,98 +0,0 @@
-/* ====================================================================
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce this list of
- * conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.org/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the OpenEJB Project. For more information
- * please see <http://openejb.org/>.
- *
- * ====================================================================
- */
-package org.openejb;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-
-
-/**
- *
- *
- * @version $Revision$ $Date$
- */
-public class EjbInvocationImplRemote extends EjbInvocationImpl {
- // Fields are immutable, but not final due to readExternal
- private Serializable subjectId;
-
- /**
- * No-arg constructor needed for Externalizable
- */
- public EjbInvocationImplRemote() {
- }
-
- public EjbInvocationImplRemote(EJBInterfaceType type, int index, Object[] arguments, Serializable subjectId) {
- super(type, index, arguments);
- this.subjectId = subjectId;
- }
-
- public EjbInvocationImplRemote(EJBInterfaceType type, Object id, int index, Object[] arguments, Serializable subjectId) {
- super(type, id, index, arguments);
- this.subjectId = subjectId;
- }
-
- public Serializable getSubjectId() {
- return subjectId;
- }
-
- public void setSubjectId(Serializable subjectId) {
- this.subjectId = subjectId;
- }
-
- public void writeExternal(ObjectOutput out) throws IOException {
- super.writeExternal(out);
- out.writeObject(subjectId);
- }
-
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- super.readExternal(in);
- subjectId = (Serializable) in.readObject();
- }
-}
Deleted: trunk/openejb2/modules/core/src/java/org/openejb/security/SubjectIdExtractInterceptor.java (2445 => 2446)
--- trunk/openejb2/modules/core/src/java/org/openejb/security/SubjectIdExtractInterceptor.java 2006-02-15 01:03:19 UTC (rev 2445)
+++ trunk/openejb2/modules/core/src/java/org/openejb/security/SubjectIdExtractInterceptor.java 2006-02-16 04:04:55 UTC (rev 2446)
@@ -1,74 +0,0 @@
-/* ====================================================================
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce this list of
- * conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.org/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the OpenEJB Project. For more information
- * please see <http://openejb.org/>.
- *
- * ====================================================================
- */
-package org.openejb.security;
-
-import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationResult;
-import org.apache.geronimo.security.ContextManager;
-import org.openejb.EjbInvocationImplRemote;
-
-
-/**
- *
- * @version $Revision$ $Date$
- */
-public class SubjectIdExtractInterceptor implements Interceptor {
- private final Interceptor next;
-
- public SubjectIdExtractInterceptor(Interceptor next) {
- this.next = next;
- }
-
- public InvocationResult invoke(Invocation invocation) throws Throwable {
- EjbInvocationImplRemote remoteInvocation = (EjbInvocationImplRemote) invocation;
- //TODO fix me Help Help!
- //ContextManager.setNextCaller(ContextManager.getRegisteredSubject((Long) remoteInvocation.getSubjectId()));
- return next.invoke(invocation);
- }
-}
