[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins EntityMultiInstanceSynchronizationInterceptor.java StatelessSessionInstanceInterceptor.java
User: mnf999
Date: 01/12/18 23:36:50
Modified:src/main/org/jboss/ejb/plugins
EntityMultiInstanceSynchronizationInterceptor.java
StatelessSessionInstanceInterceptor.java
Log:
Goodbye my friend you have served us well,
remember we love you
Revision ChangesPath
1.5 +3 -3
jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceSynchronizationInterceptor.java
Index: EntityMultiInstanceSynchronizationInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceSynchronizationInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EntityMultiInstanceSynchronizationInterceptor.java2001/11/24 20:43:22
1.4
+++ EntityMultiInstanceSynchronizationInterceptor.java2001/12/19 07:36:50
1.5
@@ -34,7 +34,7 @@
*before changing.
*
* @author mailto:[EMAIL PROTECTED]";>Bill Burke
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
* Revisions:
* 2001/08/08: billb
@@ -45,10 +45,10 @@
public class EntityMultiInstanceSynchronizationInterceptor
extends EntitySynchronizationInterceptor
{
- public void init()
+ public void create()
throws Exception
{
- super.init();
+ super.create();
if (container.getInstancePool() instanceof EntityInstancePool)
{
((EntityInstancePool)container.getInstancePool()).setReclaim(true);
1.10 +8 -6
jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Index: StatelessSessionInstanceInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StatelessSessionInstanceInterceptor.java 2001/08/03 17:15:44 1.9
+++ StatelessSessionInstanceInterceptor.java 2001/12/19 07:36:50 1.10
@@ -9,16 +9,18 @@
import java.rmi.RemoteException;
import org.jboss.ejb.Container;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
+import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.StatelessSessionContainer;
+
/**
* This container acquires the given instance. This must be used after
* the EnvironmentInterceptor, since acquiring instances requires a proper
* JNDI environment to be set
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class StatelessSessionInstanceInterceptor
extends AbstractInterceptor
@@ -47,13 +49,13 @@
// Interceptor implementation --
- public Object invokeHome(final MethodInvocation mi) throws Exception
+ public Object invokeHome(final Invocation mi) throws Exception
{
// We don't need an instance since the call will be handled by container
return getNext().invokeHome(mi);
}
- public Object invoke(final MethodInvocation mi) throws Exception
+ public Object invoke(final Invocation mi) throws Exception
{
// Get context
mi.setEnterpriseContext(container.getInstancePool().get());
@@ -80,8 +82,8 @@
} finally
{
// Return context
- if (mi.getEnterpriseContext() != null)
-container.getInstancePool().free(mi.getEnterpriseContext());
+ if ( mi.getEnterpriseContext() != null)
+container.getInstancePool().free(((EnterpriseContext)
mi.getEnterpriseContext()));
}
}
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [AUTOMATED] JBoss compilation failed
= ==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS= = HERE ARE THE LAST 50 LINES OF THE LOG FILE [xdoclet] Loading source file /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/jmx/adaptor/ejb/EJBAdaptorBean.java... [xdoclet] Constructing Javadoc information... [xdoclet] Create Home Interface for: org.jboss.jmx.adaptor.ejb.EJBAdaptorBean [xdoclet] Create Remote Interface for: org.jboss.jmx.adaptor.ejb.EJBAdaptorBean [xdoclet] Create Session Class for: org.jboss.jmx.adaptor.ejb.EJBAdaptorBean [xdoclet] Create ejb-jar.xml [xdoclet] Create jboss.xml [xdoclet] Create jaws.xml [mkdir] Created dir: /disk/orig/home/lubega/jbossro/jboss-all/server/output/mejb/beans [mkdir] Created dir: /disk/orig/home/lubega/jbossro/jboss-all/server/output/mejb/metadata/META-INF [xdoclet] Generating Javadoc [xdoclet] Javadoc execution [xdoclet] Loading source file /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/management/mejb/ManagementBean.java... [xdoclet] Constructing Javadoc information... [xdoclet] javadoc: warning - Import not found: org.jboss.management.mejb.MEJB - ignoring! [xdoclet] Create Remote Interface for: org.jboss.management.mejb.ManagementBean [xdoclet] Create Session Class for: org.jboss.management.mejb.ManagementBean [xdoclet] Create ejb-jar.xml [xdoclet] Create jboss.xml [xdoclet] Create jaws.xml [xdoclet] 1 warning compile-classes: [mkdir] Created dir: /disk/orig/home/lubega/jbossro/jboss-all/server/output/classes [javac] Compiling 600 source files to /disk/orig/home/lubega/jbossro/jboss-all/server/output/classes /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:10: warning: java.security.Identity in java.security has been deprecated import java.security.Identity; ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:214: warning: java.security.Identity in java.security has been deprecated public Identity getCallerIdentity() ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:340: warning: java.security.Identity in java.security has been deprecated public boolean isCallerInRole(Identity id) ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:340: warning: java.security.Identity in java.security has been deprecated public boolean isCallerInRole(Identity id) ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java:414: cannot resolve symbol symbol : variable mdbConfig location: class org.jboss.ejb.plugins.jms.JMSContainerInvoker dlqHandler.importXml(mdbConfig); ^ 1 error 4 warnings BUILD FAILED /disk/orig/home/lubega/jbossro/jboss-all/server/build.xml:378: Compile failed, messages should have been provided. Total time: 1 minute 5 seconds ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] commits done (for tonight)
Ok I am done with the commits, sorry for the flood, it's been 4 weeks in development. I guarantee you it will be worth your wait, the system view is clean. What we were talking about is in CVS. Next I want to fix the clustering (apologies to bill and sacha, will fix tomorrow morning) and then move on to the integrated classloaders and unified deployer as the final piece of the puzzle. Then it is beta land, microkernel under pressure... marcf Marc Fleury President JBoss Group, LLC ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] detached invokers in
it's real it's in cvs it promotes the view of the JMX system as a host for EJB. An EJB used to have the containerinvoker talking to it directly, so we would have the JMX node and on top of it as many connections to the world as beans deployed. The bean is in the node and communicates with the exterior through connector that are there always (mbeans). That is how we communicate with the EJB, through the JMX node and connectors. That is the detached invokers view it is in CVS, go check it out, it is a powerful little thing, marcf Marc Fleury President JBoss Group, LLC ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/etc/conf/default mail-service.xml
User: mnf999 Date: 01/12/18 23:38:21 Removed: src/etc/conf/default mail-service.xml Log: bringing some xml files back but really getting rid of the xml in sar default ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb MethodInvocation.java
User: mnf999 Date: 01/12/18 23:36:50 Removed: src/main/org/jboss/ejb MethodInvocation.java Log: Goodbye my friend you have served us well, remember we love you ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jrmp/server JRMPContainerInvoker.java
User: mnf999 Date: 01/12/18 23:31:37 Removed: src/main/org/jboss/ejb/plugins/jrmp/server JRMPContainerInvoker.java Log: deprecated the use of invokers to the containers, we now use invokers to the JMX node, the EJBs are just hosted components in the system, comm is done through the JMX nodes ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces AbstractHandle.java BeanProxy.java ContainerRemote.java DefaultInitialContextHandle.java EJBMetaDataImpl.java EntityHandleImpl.java EntityProxy.java GenericProxy.java HomeHandleImpl.java HomeProxy.java InitialContextHandle.java InitialContextHandleFactory.java ListEntityProxy.java PropertiesInitialContextHandle.java ReadAheadBuffer.java ReadAheadResult.java RemoteMethodInvocation.java StatefulHandleImpl.java StatefulSessionProxy.java StatelessHandleImpl.java StatelessSessionProxy.java
User: mnf999 Date: 01/12/18 23:35:58 Removed: src/main/org/jboss/ejb/plugins/jrmp/interfaces AbstractHandle.java BeanProxy.java ContainerRemote.java DefaultInitialContextHandle.java EJBMetaDataImpl.java EntityHandleImpl.java EntityProxy.java GenericProxy.java HomeHandleImpl.java HomeProxy.java InitialContextHandle.java InitialContextHandleFactory.java ListEntityProxy.java PropertiesInitialContextHandle.java ReadAheadBuffer.java ReadAheadResult.java RemoteMethodInvocation.java StatefulHandleImpl.java StatefulSessionProxy.java StatelessHandleImpl.java StatelessSessionProxy.java Log: Some files removed (the initial context stuff) some files ported and made to use the new invoker. Deprecated the ContainerRemote, see invoker and tied to one JMX node not the individual containers ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jrmp/server DefaultSocketFactory.java
User: mnf999 Date: 01/12/18 23:30:27 Removed: src/main/org/jboss/ejb/plugins/jrmp/server DefaultSocketFactory.java Log: This moved as is to the JRMPInvoker package in (invocation/jrmp) ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jrmp13/interfaces EntityProxy.java HomeProxy.java ListEntityProxy.java StatefulSessionProxy.java StatelessSessionProxy.java
User: mnf999 Date: 01/12/18 23:29:11 Removed: src/main/org/jboss/ejb/plugins/jrmp13/interfaces EntityProxy.java HomeProxy.java ListEntityProxy.java StatefulSessionProxy.java StatelessSessionProxy.java Log: The proxies in here have moved to the proxy package, they are also invoker agnostic ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jrmp13/server JRMPContainerInvoker.java
User: mnf999 Date: 01/12/18 23:27:35 Removed: src/main/org/jboss/ejb/plugins/jrmp13/server JRMPContainerInvoker.java Log: Deprecated use the JRMPinvoker TO THE JMX Node and not the the container directly ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb ProxyFactory.java
User: mnf999
Date: 01/12/18 23:26:25
Added: src/main/org/jboss/proxy/ejb ProxyFactory.java
Log:
The proxy factory generates the proxy envelope regardless of the invoker that is
used. It is transport agnostic just client focused. Here we generate jdk1.3 proxies
for clients.
Revision ChangesPath
1.1 jboss/src/main/org/jboss/proxy/ejb/ProxyFactory.java
Index: ProxyFactory.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.proxy.ejb;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.rmi.ServerException;
import java.io.IOException;
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
import javax.ejb.EJBMetaData;
import javax.naming.InitialContext;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.NameNotFoundException;
import javax.management.ObjectName;
import org.jboss.ejb.Container;
import org.jboss.ejb.ContainerInvoker;
import org.jboss.ejb.ContainerInvokerContainer;
import org.jboss.invocation.Invoker;
import org.jboss.proxy.ejb.handle.HomeHandleImpl;
import org.jboss.metadata.EntityMetaData;
import org.jboss.metadata.SessionMetaData;
import org.jboss.system.Registry;
import org.jboss.util.FinderResults;
import org.jboss.logging.Logger;
/**
*
*
* As we remove the one one association between container STACK and invoker we keep
this around
* IN the future the creation of proxies is a task done on a container basis but the
container
* as a logical representation, in other words, the container "Entity with RMI/IIOP"
is not a
* container stack but an association at the invocation level that points to all
metadata for
* a given container.
*
* In other words this is here for legacy reason and to not disrupt the container at
once
* In particular we declare that we "implement" the container invoker interface when
we are
* just implementing the Proxy generation calls. Separation of concern.
*
* @see
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @version $Revision: 1.1 $
*/
public class ProxyFactory
implements ContainerInvoker
{
// Metadata for the proxies
public EJBMetaData ejbMetaData ;
static Logger log = Logger.getLogger(ProxyFactory.class);
EJBHome home;
EJBObject statelessObject;
// The name of the bean being deployed
String jndiName;
// The name of the delegate invoker
Invoker invoker;
// A pointer to the container this proxy factory is dedicated to
Container container;
// Container plugin implementation -
public void setContainer(Container con)
{
this.container = con;
}
public void create()
throws Exception
{
Context ctx = new InitialContext();
jndiName = container.getBeanMetaData().getJndiName();
// Create metadata
/**
Constructor signature is
public EJBMetaDataImpl(Class remote,
Class home,
Class pkClass,
boolean session,
boolean statelessSession,
HomeHandle homeHandle)
*/
if (container.getBeanMetaData() instanceof EntityMetaData)
{
Class pkClass;
EntityMetaData metaData = (EntityMetaData)container.getBeanMetaData();
String pkClassName = metaData.getPrimaryKeyClass();
try
{
if (pkClassName != null)
pkClass = container.getClassLoader().loadClass(pkClassName);
else
pkClass =
container.getClassLoader().loadClass(metaData.getEjbClass()).getField(metaData.getPrimKeyField()).getClass();
} catch (NoSuchFieldException e)
{
log.error("Unable to identify Bean's Primary Key class! Did you specify
a primary key class and/or field? Does that field exist?");
throw new RuntimeException("Primary Key Problem");
} catch (NullPointerException e)
{
log.error("Unable to identify Bean's Primary Key class! Did you specify
a primary key class and/or field? Does that field exist?");
throw new RuntimeException("Primary Key Problem");
}
ejbMetaData = new EJBMetaDataImpl(
((ContainerInvokerContainer)container).getRemoteClass(),
((ContainerInvokerContainer)container).getHomeClass(),
pkClass,
false, //Session
false, //Stateless
ne
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb/handle EntityHandleImpl.java HomeHandleImpl.java StatefulHandleImpl.java StatelessHandleImpl.java
User: mnf999
Date: 01/12/18 23:22:27
Added: src/main/org/jboss/proxy/ejb/handle EntityHandleImpl.java
HomeHandleImpl.java StatefulHandleImpl.java
StatelessHandleImpl.java
Log:
the handle implementations, what is changed is that fact that the connector is now
detached from a given container but rather attached to the JMX node itself
Revision ChangesPath
1.1 jboss/src/main/org/jboss/proxy/ejb/handle/EntityHandleImpl.java
Index: EntityHandleImpl.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.proxy.ejb.handle;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
import java.rmi.ServerException;
import javax.naming.InitialContext;
import javax.ejb.Handle;
import javax.ejb.EJBObject;
import javax.ejb.EJBHome;
/**
* An EJB entity bean handle implementation.
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury.
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
* @version $Revision: 1.1 $
*/
public class EntityHandleImpl
implements Handle
{
// Constants -
/** Serial Version Identifier. */
//private static final long serialVersionUID = 1636103643167246469L;
// Attributes
/** The primary key of the entity bean. */
protected final Object id;
// The container
public String name;
// Static
// Constructors --
/**
* Construct a EntityHandleImpl.
*
* @param state The initial context state that will be used
* to restore the naming context or null to use
* a fresh InitialContext object.
* @param name JNDI name.
* @param idPrimary key of the entity.
*/
public EntityHandleImpl( String name, Object id)
{
this.name=name;
this.id = id;
}
// Public
/**
* Handle implementation.
*
* @return EJBObject reference.
*
* @throws ServerExceptionCould not get EJBObject.
* @throws RemoteException
*/
public EJBObject getEJBObject() throws RemoteException {
try {
EJBHome home = (EJBHome)new InitialContext().lookup(name);
Class type = home.getClass();
Method method = type.getMethod("findByPrimaryKey", new Class[]
{id.getClass()});
// call findByPrimary on the target
return (EJBObject)method.invoke(home, new Object[] {id});
}
catch (Exception e) {
throw new ServerException("Could not get EJBObject", e);
}
}
// Package protected -
// Protected -
// Private ---
// Inner classes -
}
1.1 jboss/src/main/org/jboss/proxy/ejb/handle/HomeHandleImpl.java
Index: HomeHandleImpl.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.proxy.ejb.handle;
import javax.ejb.HomeHandle;
import javax.ejb.EJBHome;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.rmi.ServerException;
import java.rmi.RemoteException;
/*
import java.lang.reflect.Method;
*/
/**
* An EJB home handle implementation.
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury.
* @version $Revision: 1.1 $
*/
public class HomeHandleImpl
implements HomeHandle
{
// Constants -
/** Serial Version Identifier. */
// private static final long serialVersionUID = -6105191783910395296L;
// Attributes
public String jndiName;
// Static
// Constructors --
/**
* Construct a HomeHandleImpl.
*
* @param handleThe initial context handle that will be used
* to restore the naming context or null to use
* a fresh InitialContext obj
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb ListEntityProxy.java ReadAheadBuffer.java ReadAheadResult.java
User: mnf999
Date: 01/12/18 23:21:18
Added: src/main/org/jboss/proxy/ejb ListEntityProxy.java
ReadAheadBuffer.java ReadAheadResult.java
Log:
Straight copy of the Oleg Nitz classes
Revision ChangesPath
1.1 jboss/src/main/org/jboss/proxy/ejb/ListEntityProxy.java
Index: ListEntityProxy.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.proxy.ejb;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import java.io.IOException;
import java.io.ObjectOutput;
import java.io.ObjectInput;
import java.rmi.MarshalledObject;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import javax.naming.InitialContext;
import javax.ejb.EJBObject;
import javax.ejb.EJBHome;
import org.jboss.invocation.Invoker;
import org.jboss.ejb.ListCacheKey;
/**
* An EJB CMP entity bean proxy class holds info about the List that the entity
belongs to,
* is used for reading ahead.
*
* @author mailto:[EMAIL PROTECTED]";>Oleg Nitz
* @version $Revision: 1.1 $
*/
public class ListEntityProxy
extends EntityProxy
implements InvocationHandler
{
// Constants -
/** Serial Version Identifier. */
// private static final long serialVersionUID = -1523442773137704949L;
protected static final Method GET_READ_AHEAD_VALUES;
// Attributes
/**
* A List that this entity belongs to (used for reading ahead).
*/
private List list;
/**
* A hash map of read ahead values, maps Methods to values.
*/
private transient HashMap readAheadValues;
// Static
static {
try {
final Class[] empty = {};
GET_READ_AHEAD_VALUES =
ReadAheadBuffer.class.getMethod("getReadAheadValues", empty);
}
catch (Exception e) {
e.printStackTrace();
throw new ExceptionInInitializerError(e);
}
}
// Constructors --
/**
* No-argument constructor for externalization.
*/
public ListEntityProxy() {}
/**
* Construct a ListEntityProxy.
*
* @param nameThe JNDI name of the container that we proxy for.
* @param container The remote interface of the invoker for which
*this is a proxy for.
* @param id The primary key of the entity.
* @param optimizeTrue if the proxy will attempt to optimize
*VM-local calls.
* @param listA List that this entity belongs to (used for reading
ahead).
* @param listId The list id.
* @param index The index of this entity in the list.
*
* @throws NullPointerException Id may not be null.
*/
public ListEntityProxy(String name,
Invoker invoker,
Object id,
List list,
long listId,
int index)
{
super(name, new ListCacheKey(id, listId, index), invoker);
this.list = list;
}
// Public
public Map getReadAheadValues() {
if (readAheadValues == null) {
readAheadValues = new HashMap();
}
return readAheadValues;
}
/**
* InvocationHandler implementation.
*
* @param proxy The proxy object.
* @param m The method being invoked.
* @param argsThe arguments for the method.
*
* @throws ThrowableAny exception or error thrown while processing.
*/
public final Object invoke(final Object proxy,
final Method m,
Object[] args)
throws Throwable
{
Object result;
ReadAheadResult raResult;
Object[] aheadResult;
int from;
int to;
ReadAheadBuffer buf;
if (m.equals(GET_READ_AHEAD_VALUES)) {
return getReadAheadValues();
}
// have we read ahead the result?
if (readAheadValues != null) {
result = readAheadValues.get(m);
if (readAheadValues.containsKey(m)) {
return readAheadValues.remove(m);
}
}
result = super.invoke(proxy, m, args);
if (result instanceof ReadAheadResult) {
raResult = (ReadAheadResult) result;
aheadResult = raResult.getAheadR
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb EJBMetaDataImpl.java
User: mnf999
Date: 01/12/18 23:19:03
Added: src/main/org/jboss/proxy/ejb EJBMetaDataImpl.java
Log:
copy of the old one in the new package
Revision ChangesPath
1.1 jboss/src/main/org/jboss/proxy/ejb/EJBMetaDataImpl.java
Index: EJBMetaDataImpl.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.proxy.ejb;
import java.io.Serializable;
import java.rmi.RemoteException;
import javax.ejb.HomeHandle;
import javax.ejb.EJBMetaData;
import javax.ejb.EJBHome;
import javax.ejb.EJBException;
/**
* An implementation of the EJBMetaData interface which allows a
* client to obtain the enterprise Bean's meta-data information.
*
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
* @version $Revision: 1.1 $
*/
public class EJBMetaDataImpl
implements EJBMetaData, Serializable
{
// Constants -
/** Serial Version Identifier. */
// private static final long serialVersionUID = 2590026239352080415L;
// Attributes
private final Class remote;
private final Class home;
private final Class pkClass;
private final boolean session;
private final boolean statelessSession;
private final HomeHandle homeHandle;
// Constructors --
/**
* Construct an EJBMetaDataInput.
*/
public EJBMetaDataImpl(final Class remote,
final Class home,
final Class pkClass,
final boolean session,
final boolean statelessSession,
final HomeHandle homeHandle)
{
this.remote = remote;
this.home = home;
this.pkClass = pkClass;
this.session = session;
this.statelessSession = statelessSession;
this.homeHandle = homeHandle;
}
// Constructors --
// EJBMetaData ---
// EJBMetaData ---
/**
* Obtain the home interface of the enterprise Bean.
*
* @throws EJBException Failed to get EJBHome object.
*/
public EJBHome getEJBHome() {
try {
return homeHandle.getEJBHome();
}
catch (RemoteException e) {
e.printStackTrace();
throw new EJBException(e);
}
}
/**
* Obtain the Class object for the enterprise Bean's home interface.
*/
public Class getHomeInterfaceClass() { return home; }
/**
* Obtain the Class object for the enterprise Bean's remote interface.
*/
public Class getRemoteInterfaceClass() { return remote; }
/**
* Obtain the Class object for the enterprise Bean's primary key class.
*/
public Class getPrimaryKeyClass() { return pkClass; }
/**
* Test if the enterprise Bean's type is "session".
*
* @return True if the type of the enterprise Bean is session bean.
*/
public boolean isSession() { return session; }
/**
* Test if the enterprise Bean's type is "stateless session".
*
* @return True if the type of the enterprise Bean is stateless session.
*/
public boolean isStatelessSession() { return statelessSession; }
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb EntityProxy.java GenericProxy.java HomeProxy.java StatefulSessionProxy.java StatelessSessionProxy.java
User: mnf999
Date: 01/12/18 23:20:36
Added: src/main/org/jboss/proxy/ejb EntityProxy.java
GenericProxy.java HomeProxy.java
StatefulSessionProxy.java
StatelessSessionProxy.java
Log:
Adaptation of the old proxy package in ejb.
These proxies are not aware of the transport protocols and just talk to the delegate
invoker...
Revision ChangesPath
1.1 jboss/src/main/org/jboss/proxy/ejb/EntityProxy.java
Index: EntityProxy.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.proxy.ejb;
import java.io.IOException;
import java.io.ObjectOutput;
import java.io.ObjectInput;
import java.util.HashMap;
import java.rmi.MarshalledObject;
import java.lang.reflect.Method;
import javax.naming.InitialContext;
import javax.ejb.EJBObject;
import javax.ejb.EJBHome;
import org.jboss.ejb.CacheKey;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.proxy.ejb.handle.EntityHandleImpl;
import org.jboss.util.FinderResults;
/**
* An EJB entity bean proxy class.
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @version $Revision: 1.1 $
*
* 2001/11/19: marcf
*
* Initial checkin
*
*/
public class EntityProxy
extends GenericProxy
{
// Constants -
/** Serial Version Identifier. */
// private static final long serialVersionUID = -1523442773137704949L;
// Attributes
/** The primary key of the entity bean. */
protected CacheKey cacheKey;
// Static
// Constructors --
/**
* No-argument constructor for externalization.
*/
public EntityProxy() {}
/**
* Construct a EntityProxy.
*
* @param name The JNDI name of the container that we proxy for.
* @param idThe primary key of the entity.
* @param invoker An invoker
*
* @throws NullPointerException Id may not be null.
*/
public EntityProxy(String jndiName, Object id, Invoker invoker)
{
super(jndiName, invoker);
if (id == null)
throw new NullPointerException("Id may not be null");
// make sure that our id is a CacheKey
if (id instanceof CacheKey) {
this.cacheKey = (CacheKey)id;
}
else {
// In case we pass the Object or anything else we encapsulate
cacheKey = new CacheKey(id);
}
}
// Public
/**
* InvocationHandler implementation.
*
* @param proxy The proxy object.
* @param m The method being invoked.
* @param argsThe arguments for the method.
*
* @throws ThrowableAny exception or error thrown while processing.
*/
public Object invoke(final Object proxy,
final Method m,
Object[] args)
throws Throwable
{
// Normalize args to always be an array
if (args == null)
args = EMPTY_ARGS;
// Implement local methods
if (m.equals(TO_STRING)) {
return jndiName + ":" + cacheKey.getId().toString();
}
else if (m.equals(EQUALS)) {
return invoke(proxy, IS_IDENTICAL, args);
}
else if (m.equals(HASH_CODE)) {
return new Integer(cacheKey.getId().hashCode());
}
// Implement local EJB calls
else if (m.equals(GET_HANDLE)) {
return new EntityHandleImpl(jndiName, cacheKey.getId());
}
else if (m.equals(GET_PRIMARY_KEY)) {
return cacheKey.getId();
}
else if (m.equals(GET_EJB_HOME)) {
return getEJBHome();
}
else if (m.equals(IS_IDENTICAL)) {
return isIdentical(args[0], cacheKey.getId());
}
// If not taken care of, go on and call the container
else {
return invoke(createInvocation(cacheKey, m, args));
}
}
public Invocation createInvocation(CacheKey id, Method m, Object[] args)
{
Invocation invocation = new Invocation(new HashMap());
invocation.setContainer(objectName);
invocation.setType("remote");
invocation.setId(id);
invocation.setMethod(m);
invocation.setArguments(args);
return invocation;
}
// Package protected -
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb/handle - New directory
User: mnf999 Date: 01/12/18 23:14:03 jboss/src/main/org/jboss/proxy/ejb/handle - New directory ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/proxy/ejb - New directory
User: mnf999 Date: 01/12/18 23:13:52 jboss/src/main/org/jboss/proxy/ejb - New directory ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/jrmp/server JRMPInvoker.java JRMPInvokerMBean.java
User: mnf999
Date: 01/12/18 23:11:16
Added: src/main/org/jboss/invocation/jrmp/server JRMPInvoker.java
JRMPInvokerMBean.java
Log:
The new server JRMPInvoker fully detyped, fully centralized, fully MBean :)
Revision ChangesPath
1.1 jboss/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java
Index: JRMPInvoker.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.invocation.jrmp.server;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.io.IOException;
import java.rmi.server.RemoteServer;
import java.rmi.server.UnicastRemoteObject;
import java.rmi.server.RMIServerSocketFactory;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.ServerException;
import java.rmi.MarshalledObject;
import java.util.Date;
import javax.naming.Name;
import javax.naming.InitialContext;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.NameNotFoundException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.management.ObjectName;
import javax.management.MBeanException;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.NotificationBroadcasterSupport;
import javax.management.AttributeChangeNotification;
import org.jboss.metadata.MetaData;
import org.jboss.deployment.DeploymentException;
import org.jboss.proxy.ejb.GenericProxy;
import org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.MarshalledInvocation;
import org.jboss.tm.TransactionPropagationContextFactory;
import org.jboss.tm.TransactionPropagationContextImporter;
import org.jboss.logging.Logger;
import org.jboss.system.Registry;
/**
* The JRMPInvoker is an RMI implementation that can generate Invocations from
RMI/JRMP into the JMX base
*
* @author mailto:[EMAIL PROTECTED]>Marc Fleury
*
* @version $Revision: 1.1 $
*/
public class JRMPInvoker
extends RemoteServer
implements Invoker, JRMPInvokerMBean, MBeanRegistration
{
// Constants -
protected final static int ANONYMOUS_PORT = 0;
protected static Logger log = Logger.getLogger(JRMPInvoker.class);
// Attributes
/** The port the container will be exported on */
protected int rmiPort = ANONYMOUS_PORT;
/** An optional custom client socket factory */
protected RMIClientSocketFactory clientSocketFactory;
/** An optional custom server socket factory */
protected RMIServerSocketFactory serverSocketFactory;
/** The class name of the optional custom client socket factory */
protected String clientSocketFactoryName;
/** The class name of the optional custom server socket factory */
protected String serverSocketFactoryName;
/** The address to bind the rmi port on */
protected String serverAddress;
// The MBean Server
protected MBeanServer server;
protected ObjectName serviceName;
private int state;
private int id = 0;
// Static
private static TransactionPropagationContextFactory tpcFactory;
private static TransactionPropagationContextImporter tpcImporter;
// Constructors --
// Public
// MBean parameters
public String getServerHostName()
{
try {return InetAddress.getLocalHost().getHostName();}
catch (Exception ignored) {return null;}
}
public void setRMIObjectPort(int rmiPort) {this.rmiPort = rmiPort;}
public int getRMIObjectPort() { return rmiPort;}
public void setRMIClientSocketFactory(String name) {clientSocketFactoryName =
name;}
public String getRMIClientSocketFactory() { return clientSocketFactoryName;}
public void setRMIServerSocketFactory(String name) {serverSocketFactoryName =
name;}
public String getRMIServerSocketFactory() { return serverSocketFactoryName;}
public void setServerAddress(String address) { serverAddress = address;}
public String getServerAddress() { return serverAddress;}
public String getName() {return "JRMPInvoker";}
// Service implementation ---
// Static --
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/local LocalInvoker.java LocalInvokerMBean.java
User: mnf999
Date: 01/12/18 23:12:58
Added: src/main/org/jboss/invocation/local LocalInvoker.java
LocalInvokerMBean.java
Log:
The local invoker for the straight JMX proxy->mbean communication
Revision ChangesPath
1.1 jboss/src/main/org/jboss/invocation/local/LocalInvoker.java
Index: LocalInvoker.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.invocation.local;
import java.net.InetAddress;
import javax.management.ObjectName;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.MBeanRegistration;
import javax.transaction.TransactionManager;
import javax.naming.InitialContext;
import org.jboss.proxy.ejb.GenericProxy;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy;
import org.jboss.system.Registry;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.logging.Logger;
/**
* The Invoker is a local gate in the JMX system.
*
* @author mailto:[EMAIL PROTECTED]>Marc Fleury
*
* @version $Revision: 1.1 $
*
*/
public class LocalInvoker
extends ServiceMBeanSupport
implements Invoker, LocalInvokerMBean
{
// Constants -
protected static Logger log = Logger.getLogger(LocalInvoker.class);
// Attributes
// The MBean Server
protected MBeanServer server;
// The ObjectName for the local invoker
protected ObjectName name;
// Static
// Constructors --
// Public
// Service implementation ---
public String getName() { return "LocalInvoker";}
public void create()
throws Exception
{
//note on design: We need to call it ourselves as opposed to letting the
client JRMPDelegate look it
// up through the use of Registry, the reason being including the classes in
the client.
// If we move to a JNDI format (with local calls) for the registry we could
remove the call below
JRMPInvokerProxy.setLocal(this);
Registry.bind(name, this);
}
public void start()
throws Exception
{
GenericProxy.setTransactionManager((TransactionManager)new
InitialContext().lookup("java:/TransactionManager"));
log.debug("Local invoker for JMX node started");
}
public void stop()
{
}
public void destroy()
{
Registry.unbind(name);
}
// Invoker implementation
public String getServerHostName()
{
try {return InetAddress.getLocalHost().getHostName();}
catch (Exception ignored) {return null;}
}
/**
* Invoke a method.
*/
public Object invoke(Invocation invocation)
throws Exception
{
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
try
{
// Extract the ObjectName
ObjectName mbean = new ObjectName((String) invocation.getContainer());
return server.invoke(mbean, invocation.getType(), new Object[]
{invocation}, new String[] {"java.lang.Object"});
}
catch (MBeanException mbe) { throw mbe.getTargetException(); }
finally
{
Thread.currentThread().setContextClassLoader(oldCl);
}
}
// Package protected -
// Protected -
// Private ---
// MBeanRegistration implementation
---
public ObjectName preRegister(MBeanServer server, ObjectName name)
throws Exception
{
this.server = server;
this.name = name;
log.info("Local Invoker MBean online");
//return name == null ? new ObjectName(OBJECT_NAME) : name;
return name;
}
public void postRegister(Boolean registrationDone)
{
if (!registrationDone.booleanValue())
{
log.info( "Registration of JRMP Invoker MBean failed" );
}
}
public void preDeregister()
throws Exception
{
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/jrmp/interfaces JRMPInvokerProxy.java
User: mnf999
Date: 01/12/18 23:07:47
Added: src/main/org/jboss/invocation/jrmp/interfaces
JRMPInvokerProxy.java
Log:
invoker proxy holds remote and local, responsible for the switch logic.
Revision ChangesPath
1.1
jboss/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxy.java
Index: JRMPInvokerProxy.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.invocation.jrmp.interfaces;
import java.io.IOException;
import java.io.Externalizable;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.rmi.ServerException;
import java.rmi.NoSuchObjectException;
import java.rmi.MarshalledObject;
import javax.transaction.SystemException;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.MarshalledInvocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.local.LocalInvoker;
import org.jboss.tm.TransactionPropagationContextFactory;
/**
*
* JRMPInvokerProxy, local to the proxy and is capable of delegating to local and
JRMP implementations
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @version $Revision: 1.1 $
*
* 2001/11/19: marcf
*
* Initial checkin
*
*/
public class JRMPInvokerProxy
implements Invoker, Externalizable
{
// Constants -
/** Serial Version Identifier. */
// private static final long serialVersionUID = 1870461898442160570L;
// Attributes
// We use this startup time to find if we are in the original VM
private long containerStartup = Invoker.STARTUP;
// Invoker to the remote JMX node
protected Invoker remoteInvoker;
// Static references to local invokers
protected static Invoker localInvoker;
/**
* Factory for transaction propagation contexts.
*
* When set to a non-null value, it is used to get transaction
* propagation contexts for remote method invocations.
* If null, transactions are not propagated on
* remote method invocations.
*/
protected static TransactionPropagationContextFactory tpcFactory = null;
// Get and set methods
//Local invoker reference, useful for optimization
public static Invoker getLocal() { return localInvoker;}
public static void setLocal(Invoker invoker) { localInvoker = invoker ;}
// TPC factory
public static void setTPCFactory(TransactionPropagationContextFactory tpcf) {
tpcFactory = tpcf; }
// Constructors --
public JRMPInvokerProxy() {
// For externalization to work
}
/**
* Create a new Proxy.
*
* @param container
* The remote interface of the container invoker of the
* container we proxy for.
*/
public JRMPInvokerProxy(Invoker remoteInvoker)
{
this.remoteInvoker = remoteInvoker;
}
// Public
/**
* Returns wether we are local to the originating container or not.
*/
public boolean isLocal() { return containerStartup == Invoker.STARTUP; }
// The name of of the server
public String getServerHostName() throws Exception {return
remoteInvoker.getServerHostName();}
/**
* Return the transaction propagation context of the transaction
* associated with the current thread.
* Returns null if the transaction manager was never
* set, or if no transaction is associated with the current thread.
*/
public Object getTransactionPropagationContext()
throws SystemException
{
return (tpcFactory == null) ? null :
tpcFactory.getTransactionPropagationContext();
}
/**
* The invocation on the delegate, calls the right invoker. Remote if we are
remote, local if we
* are local.
*/
public Object invoke(Invocation invocation)
throws Exception
{
// optimize if calling another bean in same EJB-application
if (isLocal()) {
// The payload as is is good
// FIXME FIXME FIXME FIXME FIXME USE THIS WHEN CL ARE INTEGRATED
// return localInvoker.invoke(invocation);
// FIXME FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED
Object value;
// FIXME FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED
try {
// FIXME FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATE
[JBoss-dev] CVS update: jboss/src/main/org/jboss/deployment ServiceDeploymentInfo.java
User: mnf999 Date: 01/12/18 22:58:43 Modified:src/main/org/jboss/deployment ServiceDeploymentInfo.java Log: cleaned up imports Revision ChangesPath 1.2 +5 -33 jboss/src/main/org/jboss/deployment/ServiceDeploymentInfo.java Index: ServiceDeploymentInfo.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeploymentInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ServiceDeploymentInfo.java2001/12/19 06:53:05 1.1 +++ ServiceDeploymentInfo.java2001/12/19 06:58:43 1.2 @@ -6,45 +6,17 @@ */ package org.jboss.deployment; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; +import java.util.List; +import java.io.File; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.StringTokenizer; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.ReflectionException; -import javax.management.RuntimeErrorException; -import javax.management.RuntimeMBeanException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import org.jboss.system.Service; -import org.jboss.system.ServiceLibraries; -import org.jboss.system.ServiceMBeanSupport; import org.jboss.system.URLClassLoader; -import org.jboss.logging.Logger; +import java.util.Iterator; +import org.jboss.logging.Logger; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * Service Deployment Info . @@ -56,7 +28,7 @@ * @author mailto:[EMAIL PROTECTED]";>Marc Fleury * @author mailto:[EMAIL PROTECTED]";>David Maplesden * @author mailto:[EMAIL PROTECTED]";>David Jencks -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * * 20011211 marc fleury: * ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/jrmp/server DefaultSocketFactory.java
User: mnf999
Date: 01/12/18 23:09:16
Added: src/main/org/jboss/invocation/jrmp/server
DefaultSocketFactory.java
Log:
a straight copy of the DSF from Scott Stark... as is
Revision ChangesPath
1.1
jboss/src/main/org/jboss/invocation/jrmp/server/DefaultSocketFactory.java
Index: DefaultSocketFactory.java
===
package org.jboss.invocation.jrmp.server;
import java.io.IOException;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.UnknownHostException;
import java.rmi.server.RMIServerSocketFactory;
/**
*
* @author [EMAIL PROTECTED]
* @version $Revision: 1.1 $
*/
public class DefaultSocketFactory
implements RMIServerSocketFactory, Serializable
{
private transient InetAddress bindAddress;
public String getBindAddress()
{
String address = null;
if( bindAddress != null )
address = bindAddress.getHostAddress();
return address;
}
public void setBindAddress(String host) throws UnknownHostException
{
bindAddress = InetAddress.getByName(host);
}
/**
* Create a server socket on the specified port (port 0 indicates
* an anonymous port).
* @param port the port number
* @return the server socket on the specified port
* @exception IOException if an I/O error occurs during server socket
* creation
* @since 1.2
*/
public ServerSocket createServerSocket(int port) throws IOException
{
ServerSocket activeSocket = new ServerSocket(port, 50, bindAddress);
return activeSocket;
}
public boolean equals(Object obj)
{
return obj instanceof DefaultSocketFactory;
}
public int hashCode()
{
return getClass().getName().hashCode();
}
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceContext.java
User: mnf999 Date: 01/12/18 23:06:20 Modified:src/main/org/jboss/system ServiceContext.java Log: wrong name :) Revision ChangesPath 1.2 +2 -2 jboss/src/main/org/jboss/system/ServiceContext.java Index: ServiceContext.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceContext.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ServiceContext.java 2001/12/19 07:03:58 1.1 +++ ServiceContext.java 2001/12/19 07:06:20 1.2 @@ -16,8 +16,8 @@ * @see Service * @see ServiceMBeanSupport * - * @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer - * @version $Revision: 1.1 $ + * @author mailto:[EMAIL PROTECTED]";>marc fleury + * @version $Revision: 1.2 $ * * Revisions: * ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest/src/resources/jmx test-service.xml
User: mnf999 Date: 01/12/18 22:49:30 Modified:src/resources/jmx test-service.xml Log: Revision ChangesPath 1.4 +4 -4 jbosstest/src/resources/jmx/test-service.xml Index: test-service.xml === RCS file: /cvsroot/jboss/jbosstest/src/resources/jmx/test-service.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- test-service.xml 2001/11/19 06:59:13 1.3 +++ test-service.xml 2001/12/19 06:49:30 1.4 @@ -14,11 +14,11 @@ DeployTestDS java:/TransactionManager - -JBOSS-SYSTEM:service=Hypersonic + +JBOSS-SYSTEM:service=Hypersonic -JCA:service=RARDeployment,name=Minerva JDBC LocalTransaction ResourceAdapter -JCA:service=ConnectionManagerFactoryLoader,name=MinervaSharedLocalCMFactory +JCA:service=RARDeployment,name=Minerva JDBC LocalTransaction ResourceAdapter +JCA:service=ConnectionManagerFactoryLoader,name=MinervaSharedLocalCMFactory # #Wed Aug 15 16:17:29 EDT 2001 MinSize=0 ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest/src/main/org/jboss/test/testbean2/bean AllTypesBean.java
User: mnf999
Date: 01/12/18 22:49:30
Modified:src/main/org/jboss/test/testbean2/bean AllTypesBean.java
Log:
Revision ChangesPath
1.2 +180 -179
jbosstest/src/main/org/jboss/test/testbean2/bean/AllTypesBean.java
Index: AllTypesBean.java
===
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/testbean2/bean/AllTypesBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AllTypesBean.java 2000/09/27 00:46:36 1.1
+++ AllTypesBean.java 2001/12/19 06:49:30 1.2
@@ -19,185 +19,186 @@
public class AllTypesBean implements EntityBean {
-public boolean aBoolean;
- public byte aByte;
- public short aShort;
-public int anInt;
-public long aLong;
- public float aFloat;
- public double aDouble;
-//public char aChar;
-public String aString;
-public Date aDate;
- public Timestamp aTimestamp;
-
- public MyObject anObject;
-
-public StatefulSession statefulSession;
-public StatelessSession statelessSession;
-public EnterpriseEntity enterpriseEntity;
-
- public Collection aList;
-
- private EntityContext entityContext;
+ public boolean aBoolean;
+ public byte aByte;
+ public short aShort;
+ public int anInt;
+ public long aLong;
+ public float aFloat;
+ public double aDouble;
+ //public char aChar;
+ public String aString;
+ public Date aDate;
+ public Timestamp aTimestamp;
+
+ public MyObject anObject;
+
+ public StatefulSession statefulSession;
+ public StatelessSession statelessSession;
+ public EnterpriseEntity enterpriseEntity;
+
+ public Collection aList;
+
+ private EntityContext entityContext;
+
+
+ public String ejbCreate(String pk) throws RemoteException, CreateException {
+ return ejbCreate(true, (byte)1, (short)2, (int)3, (long)4, (float)5.6,
+ (double)7.8, /*'9',*/ pk, new Date(System.currentTimeMillis()),
+ new Timestamp(System.currentTimeMillis()), new MyObject());
+ }
+
+ public void ejbPostCreate(String pk)
+ throws RemoteException, CreateException {}
+
+
+ public String ejbCreate(boolean aBoolean, byte aByte, short aShort, int anInt,
+ long aLong, float aFloat, double aDouble, /*char aChar,*/ String aString,
+ Date aDate, Timestamp aTimestamp, MyObject anObject )
+
+ throws RemoteException, CreateException {
+
+ this.aBoolean = aBoolean;
+ this.aByte = aByte;
+ this.aShort = aShort;
+ this.anInt = anInt;
+ this.aLong = aLong;
+ this.aFloat = aFloat;
+ this.aDouble = aDouble;
+ //this.aChar = aChar;
+ this.aString = aString;
+ this.aDate = aDate;
+ this.aTimestamp = aTimestamp;
+ this.anObject = anObject;
+
+ try {
+ Context ctx = new InitialContext();
+
+ StatefulSessionHome sfHome =
(StatefulSessionHome)ctx.lookup("java:comp/env/ejb/stateful");
+ statefulSession = sfHome.create();
+
+ StatelessSessionHome slHome =
(StatelessSessionHome)ctx.lookup("java:comp/env/ejb/stateless");
+ statelessSession = slHome.create();
+
+ EnterpriseEntityHome eeHome =
(EnterpriseEntityHome)ctx.lookup("java:comp/env/ejb/entity");
+ try {
+enterpriseEntity = eeHome.findByPrimaryKey(aString);
+ } catch (FinderException e) {
+enterpriseEntity = eeHome.create(aString);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new CreateException(e.getMessage());
+ }
+
+ aList = new ArrayList();
+
+ return null;
+ }
+
+
+ public void ejbPostCreate(boolean aBoolean, byte aByte, short aShort, int anInt,
+ long aLong, float aFloat, double aDouble, /*char aChar,*/ String aString,
+ Date aDate, Timestamp aTimestamp, MyObject anObject )
+
+ throws RemoteException, CreateException {}
+
+ public void ejbActivate() throws RemoteException {}
+
+ public void ejbLoad() throws RemoteException {}
+
+ public void ejbPassivate() throws RemoteException {}
+
+ public void ejbRemove() throws RemoteException, RemoveException {}
+
+ public void ejbStore() throws RemoteException {}
+
+
+ public void setEntityContext(EntityContext context) throws RemoteException {
+ entityContext = context;
+ }
+
+ public void unsetEntityContext() throws RemoteException {
+ entityContext = null;
+ }
+
+
+ public String callBusinessMethodA() throws RemoteException {
+ // test external e
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/jrmp/interfaces - New directory
User: mnf999 Date: 01/12/18 23:04:39 jboss/src/main/org/jboss/invocation/jrmp/interfaces - New directory ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/jrmp/server - New directory
User: mnf999 Date: 01/12/18 23:04:39 jboss/src/main/org/jboss/invocation/jrmp/server - New directory ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest/src/resources/jmx/mbeand/META-INF jboss-service.xml
User: mnf999 Date: 01/12/18 22:49:31 Modified:src/resources/jmx/mbeand/META-INF jboss-service.xml Log: Revision ChangesPath 1.5 +3 -3 jbosstest/src/resources/jmx/mbeand/META-INF/jboss-service.xml Index: jboss-service.xml === RCS file: /cvsroot/jboss/jbosstest/src/resources/jmx/mbeand/META-INF/jboss-service.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jboss-service.xml 2001/11/19 06:59:14 1.4 +++ jboss-service.xml 2001/12/19 06:49:31 1.5 @@ -1,13 +1,13 @@ - + -test:name=TestDeployerA -test:name=TestDeployerC +test:name=TestDeployerA +test:name=TestDeployerC ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceContext.java
User: mnf999
Date: 01/12/18 23:03:58
Added: src/main/org/jboss/system ServiceContext.java
Log:
the context information for a service (who depends onme etc etc)
Revision ChangesPath
1.1 jboss/src/main/org/jboss/system/ServiceContext.java
Index: ServiceContext.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.system;
import javax.management.ObjectName;
import java.util.List;
import java.util.LinkedList;
/**
* ServiceContext holds information for the Service
*
* @see Service
* @see ServiceMBeanSupport
*
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
* @version $Revision: 1.1 $
*
* Revisions:
*
* 20011219 marc fleury:
*
* initial check in.
*
*/
public class ServiceContext
{
public static int INSTALLED = 0;
public static int CONFIGURED = 1;
public static int CREATED = 2;
public static int RUNNING = 3;
public static int FAILED = 4;
public static int STOPPED = 5;
public static int DESTROYED = 6;
public static int NOTYETINSTALLED = 7;
/** The name of the service **/
public ObjectName objectName;
/** State of the service **/
public int state = NOTYETINSTALLED;
/** dependent beans **/
public List iDependOn = new LinkedList();
/** beans that depend on me **/
public List dependsOnMe = new LinkedList();
/** the fancy proxy to my service calls **/
public Service proxy;
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system Registry.java
User: mnf999
Date: 01/12/18 23:00:50
Added: src/main/org/jboss/system Registry.java
Log:
A simple registry to bypass the lack of registry publicly browsable in JMX
Revision ChangesPath
1.1 jboss/src/main/org/jboss/system/Registry.java
Index: Registry.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.system;
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
/**
* A registry, really, a registry.
*
* All methods static to lookup pointers from anyplace in the VM. We use it for
hooking up JMX
* managed objects. Use the JMX MBeanName to put objects here.
*
* @author mailto:[EMAIL PROTECTED]>Marc Fleury
*
* @version $Revision: 1.1 $
*/
public class Registry
{
public static Map entries = Collections.synchronizedMap(new HashMap());
public static void bind(Object key, Object value) { entries.put(key,value);}
public static Object unbind(Object key) { return entries.remove(key); }
public static Object lookup(Object key) { return entries.get(key); }
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest/src/main/org/jboss/test/testbean/interfaces BMTStatefulHome.java
User: mnf999
Date: 01/12/18 22:49:30
Modified:src/main/org/jboss/test/testbean/interfaces
BMTStatefulHome.java
Log:
Revision ChangesPath
1.2 +3 -0
jbosstest/src/main/org/jboss/test/testbean/interfaces/BMTStatefulHome.java
Index: BMTStatefulHome.java
===
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/testbean/interfaces/BMTStatefulHome.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BMTStatefulHome.java 2000/09/27 00:46:31 1.1
+++ BMTStatefulHome.java 2001/12/19 06:49:30 1.2
@@ -8,5 +8,8 @@
public interface BMTStatefulHome extends EJBHome {
public BMTStateful create() throws java.rmi.RemoteException,
javax.ejb.CreateException;
+ public BMTStateful create(String caca) throws java.rmi.RemoteException,
javax.ejb.CreateException;
+ public BMTStateful create(String caca, String cacaprout) throws
java.rmi.RemoteException, javax.ejb.CreateException;
+
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [AUTOMATED] JBoss compilation failed
=
==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS=
=
HERE ARE THE LAST 50 LINES OF THE LOG FILE
destroy(((ServiceContext) iterator.next()).objectName);
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:418:
cannot resolve symbol
symbol : variable ServiceContext
location: class org.jboss.system.ServiceController
catch (Exception e){ ctx.state = ServiceContext.FAILED; throw e;}
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:448:
cannot resolve symbol
symbol : class ServiceContext
location: class org.jboss.system.ServiceController
ServiceContext ctx = getServiceContext(objectName);
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:454:
cannot resolve symbol
symbol : class ServiceContext
location: class org.jboss.system.ServiceController
((ServiceContext) iterator.next()).dependsOnMe.remove(ctx);
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:542:
cannot resolve symbol
symbol : class ServiceContext
location: class org.jboss.system.ServiceController
name = ((ServiceContext)i.previous()).objectName;
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:654:
cannot resolve symbol
symbol : class ServiceContext
location: class org.jboss.system.ServiceController
if (nameToServiceMap.containsKey(objectName)) return (ServiceContext)
nameToServiceMap.get(objectName);
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:657:
cannot resolve symbol
symbol : class ServiceContext
location: class org.jboss.system.ServiceController
ServiceContext ctx = new ServiceContext();
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/system/ServiceController.java:657:
cannot resolve symbol
symbol : class ServiceContext
location: class org.jboss.system.ServiceController
ServiceContext ctx = new ServiceContext();
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/tm/usertx/client/ClientUserTransaction.java:83:
cannot resolve symbol
symbol : variable JRMPInvokerProxy
location: class org.jboss.tm.usertx.client.ClientUserTransaction
JRMPInvokerProxy.setTPCFactory(this);
^
87 errors
4 warnings
BUILD FAILED
/disk/orig/home/lubega/jbossro/jboss-all/server/build.xml:378: Compile failed,
messages should have been provided.
Total time: 58 seconds
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/deployment ServiceDeploymentInfo.java
User: mnf999
Date: 01/12/18 22:53:05
Added: src/main/org/jboss/deployment ServiceDeploymentInfo.java
Log:
This file really belongs by itself no inner class cuteness here,
the SDI should in fact grow to provide the basis for many of our deployer logic
Revision ChangesPath
1.1 jboss/src/main/org/jboss/deployment/ServiceDeploymentInfo.java
Index: ServiceDeploymentInfo.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.deployment;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.StringTokenizer;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeErrorException;
import javax.management.RuntimeMBeanException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.jboss.system.Service;
import org.jboss.system.ServiceLibraries;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.URLClassLoader;
import org.jboss.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
* Service Deployment Info .
*
* Every deployment (even the J2EE ones) should be seen at some point as
* Service Deployment info
*
* @see org.jboss.system.Service
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>David Maplesden
* @author mailto:[EMAIL PROTECTED]";>David Jencks
* @version $Revision: 1.1 $
*
* 20011211 marc fleury:
*
*initial import based on d-jenck deployement info inner class in
DeploymentMBeanSupport
*
*
*/
public class ServiceDeploymentInfo
{
// Variables
//STATE
public static final int EMPTY = 0;
public static final int INSTALLED = 1;
public static final int CLASSESLOADED = 2;
public static final int MBEANSLOADED = 3;
public static final int SUSPENDED = 4;
public static final int GHOST = 5; //undeployed but packages are suspended on us.
// TYPE, mostly un-used for now, revisit when we unify deployment and CL
public static final int NONE = 999; // Undifined
public static final int SAR = 1000; // Provides classes
public static final int JAR = 1001; // Provides classes
public static final int RAR = 1002; // Provides classes
public static final int WAR = 1003; // Provides classes
public static final int DIR = 1004; // Provides classes
public static final int XML = 1005;
public static final int EAR = 1006;
/** the URL identifing this SDI **/
public URL key;
public List dirs = new ArrayList();
public List classUrls = new ArrayList();
public List xmlUrls = new ArrayList();
public URLClassLoader cl;
/** The classpath declared by this xml descriptor, needs entry **/
Collection classpath = new ArrayList();
// The mbeans deployed from this SAR
List mbeans = new ArrayList();
// The XML document service.xml
Document dd;
// State
int state = EMPTY;
int type = NONE;
public ServiceDeploymentInfo(URL url)
{
this.key = url;
if (url.toString().endsWith("SAR")) type = SAR;
else if(url.toString().endsWith("JAR")) type = JAR;
else if(url.toString().endsWith("RAR")) type = RAR;
else if(url.toString().endsWith("WAR")) type = WAR;
else if(url.toString().endsWith("DIR")) type = DIR;
else if(url.toString().endsWith("XML")) type = XML;
else if(url.toString().endsWith("EAR")) type = EAR;
}
public void addDir(File dir) {dirs.add(dir);}
public void addClassUrl(URL url){classUrls.add(url);}
public List getClassUrls(){ return classUrls;}
public void addXmlUrl(URL url){xmlUrls.add(url);}
public List getXmlUrls(){return xmlUrls;}
public URLClassLoader createClassLoade
[JBoss-dev] CVS update: jbosstest/src/main/org/jboss/test/testbean/bean BMTStatefulBean.java
User: mnf999
Date: 01/12/18 22:49:30
Modified:src/main/org/jboss/test/testbean/bean BMTStatefulBean.java
Log:
Revision ChangesPath
1.2 +6 -1
jbosstest/src/main/org/jboss/test/testbean/bean/BMTStatefulBean.java
Index: BMTStatefulBean.java
===
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/testbean/bean/BMTStatefulBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BMTStatefulBean.java 2000/09/27 00:46:29 1.1
+++ BMTStatefulBean.java 2001/12/19 06:49:30 1.2
@@ -21,7 +21,12 @@
System.out.println("BMTStatefulBean.ejbCreate() called");
}
- public void ejbActivate() throws RemoteException {
+
+ public void ejbCreate(String caca) throws RemoteException, CreateException{};
+
+ public void ejbCreate(String caca, String cacaprout) throws RemoteException,
CreateException{};
+
+ public void ejbActivate() throws RemoteException {
System.out.println("BMTStatefulBean.ejbActivate() called");
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest/src/resources/jmx/mbeancrashtest/META-INF jboss-service.xml
User: mnf999 Date: 01/12/18 22:49:30 Modified:src/resources/jmx/mbeancrashtest/META-INF jboss-service.xml Log: Revision ChangesPath 1.2 +1 -1 jbosstest/src/resources/jmx/mbeancrashtest/META-INF/jboss-service.xml Index: jboss-service.xml === RCS file: /cvsroot/jboss/jbosstest/src/resources/jmx/mbeancrashtest/META-INF/jboss-service.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jboss-service.xml 2001/11/30 15:48:05 1.1 +++ jboss-service.xml 2001/12/19 06:49:30 1.2 @@ -3,7 +3,7 @@ and both should be removed on undeploy--> - CrashTest:name=Crash + CrashTest:name=Crash ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceMBeanSupport.java
User: mnf999
Date: 01/12/18 22:36:11
Modified:src/main/org/jboss/system ServiceMBeanSupport.java
Log:
Reinstated init as create
Revision ChangesPath
1.9 +63 -72jboss/src/main/org/jboss/system/ServiceMBeanSupport.java
Index: ServiceMBeanSupport.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceMBeanSupport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServiceMBeanSupport.java 2001/12/04 03:24:36 1.8
+++ ServiceMBeanSupport.java 2001/12/19 06:36:11 1.9
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.system;
import java.util.Date;
@@ -19,57 +19,57 @@
import org.apache.log4j.NDC;
/**
- * An abstract base class JBoss services can subclass to implement a
- * service that conforms to the ServiceMBean interface. Subclasses must
- * override {@link #getName} method and should override
- * {@link #startService}, and {@link #stopService} as approriate.
- *
- * @see ServiceMBean
- *
- * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @author mailto:[EMAIL PROTECTED]";>Scott Stark
- * @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
- * @version $Revision: 1.8 $
- *
- * Revisions:
- *
- * 20010619 scott.stark:
- *
- * use the full service class name as the log4j log name
- *
- * 20011202 Andreas Schaefer:
- *
- * Add the own MBean Service Name to be remembered in an attribute
- *
- */
+* An abstract base class JBoss services can subclass to implement a
+* service that conforms to the ServiceMBean interface. Subclasses must
+* override {@link #getName} method and should override
+* {@link #startService}, and {@link #stopService} as approriate.
+*
+* @see ServiceMBean
+*
+* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
+* @author mailto:[EMAIL PROTECTED]";>Scott Stark
+* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
+* @version $Revision: 1.9 $
+*
+* Revisions:
+*
+* 20010619 scott.stark:
+*
+* use the full service class name as the log4j log name
+*
+* 20011202 Andreas Schaefer:
+*
+* Add the own MBean Service Name to be remembered in an attribute
+*
+*/
public abstract class ServiceMBeanSupport
- extends NotificationBroadcasterSupport
- implements ServiceMBean, MBeanRegistration
+extends NotificationBroadcasterSupport
+implements ServiceMBean, MBeanRegistration
{
// Attributes
-
+
private int state;
private MBeanServer server;
/** Own Object Name this MBean is registered with, see {@link #preRegister
preRegister()}. **/
private ObjectName mServiceName;
private int id = 0;
-
+
protected Logger log;
-
+
// Static
-
+
// Constructors --
-
+
public ServiceMBeanSupport()
{
log = Logger.getLogger(getClass());
}
-
+
// Public
-
+
public abstract String getName();
-
- public ObjectName getServiceName() {
+
+ public ObjectName getServiceName() {
return mServiceName;
}
@@ -77,7 +77,7 @@
{
return server;
}
-
+
public int getState()
{
return state;
@@ -87,20 +87,20 @@
{
return states[state];
}
-
+
public Logger getLog()
{
return log;
}
-
- /* public void init()
- throws Exception
+
+ public void create()
+ throws Exception
{
NDC.push(getName());
log.info("Initializing");
try
{
- initService();
+ createService();
}
catch (Exception e)
{
@@ -113,13 +113,13 @@
}
log.info("Initialized");
}
- */
+
public void start()
- throws Exception
+ throws Exception
{
if (getState() != STOPPED && getState() != FAILED)
return;
-
+
state = STARTING;
//AS It seems that the first attribute is not needed anymore and use a long
instead of a Date
sendNotification(new AttributeChangeNotification(this, id++, new
Date().getTime(), getName()+" starting", "State", "java.lang.Integer", new
Integer(STOPPED), new Integer(STARTING)));
@@ -151,7 +151,7 @@
{
if (getState() != STARTED)
retu
[JBoss-dev] CVS update: jboss/src/main/org/jboss/util LRUCachePolicy.java TimedCachePolicy.java
User: mnf999
Date: 01/12/18 22:45:20
Modified:src/main/org/jboss/util LRUCachePolicy.java
TimedCachePolicy.java
Log:
init->create
Revision ChangesPath
1.11 +2 -2 jboss/src/main/org/jboss/util/LRUCachePolicy.java
Index: LRUCachePolicy.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/util/LRUCachePolicy.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LRUCachePolicy.java 2001/08/03 17:15:57 1.10
+++ LRUCachePolicy.java 2001/12/19 06:45:20 1.11
@@ -12,7 +12,7 @@
* Implementation of a Least Recently Used cache policy.
*
* @author mailto:[EMAIL PROTECTED]";>Simone Bordet
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class LRUCachePolicy
implements CachePolicy
@@ -68,7 +68,7 @@
* @see #start
* @see #destroy
*/
- public void init() throws Exception
+ public void create() throws Exception
{
m_map = new HashMap();
m_list = createList();
1.4 +2 -2 jboss/src/main/org/jboss/util/TimedCachePolicy.java
Index: TimedCachePolicy.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/util/TimedCachePolicy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimedCachePolicy.java 2001/08/03 17:15:58 1.3
+++ TimedCachePolicy.java 2001/12/19 06:45:20 1.4
@@ -23,7 +23,7 @@
until they are accessed.
@author mailto:[EMAIL PROTECTED]";>Scott Stark.
-@version $Revision: 1.3 $
+@version $Revision: 1.4 $
*/
public class TimedCachePolicy extends TimerTask implements CachePolicy
{
@@ -105,7 +105,7 @@
// Service implementation --
/** Initializes the cache for use. Prior to this the cache has no store.
*/
-public void init()
+public void create()
{
if( threadSafe )
entryMap = new HashMap();
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/util CounterInterceptor.java
User: mnf999
Date: 01/12/18 22:44:52
Modified:src/main/org/jboss/util CounterInterceptor.java
Log:
init->create
Revision ChangesPath
1.7 +4 -4 jboss/src/main/org/jboss/util/CounterInterceptor.java
Index: CounterInterceptor.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/util/CounterInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CounterInterceptor.java 2001/11/26 03:19:46 1.6
+++ CounterInterceptor.java 2001/12/19 06:44:52 1.7
@@ -4,7 +4,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.Container;
import org.jboss.ejb.plugins.*;
@@ -56,7 +56,7 @@
return container;
}
- public Object invokeHome(MethodInvocation mi) throws Exception {
+ public Object invokeHome(Invocation mi) throws Exception {
long startTime=System.currentTimeMillis();
try {
return super.invokeHome(mi);
@@ -71,7 +71,7 @@
}
}
- public Object invoke(MethodInvocation mi) throws Exception {
+ public Object invoke(Invocation mi) throws Exception {
long startTime=System.currentTimeMillis();
try {
return super.invoke(mi);
@@ -86,7 +86,7 @@
}
}
- public void init() throws java.lang.Exception {
+ public void create() throws java.lang.Exception {
//get a reference to the CounterService from JNDI
log.debug("CounterInterceptor initializing");
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/tm/usertx/client ClientUserTransaction.java
User: mnf999
Date: 01/12/18 22:43:40
Modified:src/main/org/jboss/tm/usertx/client
ClientUserTransaction.java
Log:
The GenericProxy doesn't care, the InvokerProxy does care, new structure of proxies
Revision ChangesPath
1.4 +3 -4
jboss/src/main/org/jboss/tm/usertx/client/ClientUserTransaction.java
Index: ClientUserTransaction.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/tm/usertx/client/ClientUserTransaction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClientUserTransaction.java2001/09/26 20:50:21 1.3
+++ ClientUserTransaction.java2001/12/19 06:43:40 1.4
@@ -28,9 +28,8 @@
import javax.transaction.HeuristicRollbackException;
import org.jboss.tm.TransactionPropagationContextFactory;
+import org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy;
-import org.jboss.ejb.plugins.jrmp.interfaces.GenericProxy;
-
import org.jboss.tm.usertx.interfaces.UserTransactionSession;
import org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory;
@@ -46,7 +45,7 @@
* propagation contexts of the transactions started here.
*
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ClientUserTransaction
implements UserTransaction,
@@ -81,7 +80,7 @@
{
// Tell the proxy that this is the factory for
// transaction propagation contexts.
- GenericProxy.setTPCFactory(this);
+ JRMPInvokerProxy.setTPCFactory(this);
}
// Public
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system URLClassLoader.java
User: mnf999
Date: 01/12/18 22:42:33
Modified:src/main/org/jboss/system URLClassLoader.java
Log:
don't scare little girls about the resource not found
Revision ChangesPath
1.10 +78 -83jboss/src/main/org/jboss/system/URLClassLoader.java
Index: URLClassLoader.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/URLClassLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- URLClassLoader.java 2001/12/08 04:35:42 1.9
+++ URLClassLoader.java 2001/12/19 06:42:33 1.10
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.system;
import java.net.URL;
@@ -12,62 +12,62 @@
/**
- * The URLClassLoader is associated with a given URL.
- * It can load jar and sar (or jsr).
- *
- * The ServiceLibraries keeps track of the UCL and asks everyone for
- *resources and classes.
- *
- * @author Marc Fleury
- * @author Christoph G. Jung
- * @version $Revision: 1.9 $
- *
- * 20010830 marc fleury:
- *
- * Initial import
- *
- * 20011009 cgj:
- *
- * fixed default resolution behaviour
- *
- */
+* The URLClassLoader is associated with a given URL.
+* It can load jar and sar (or jsr).
+*
+* The ServiceLibraries keeps track of the UCL and asks everyone for
+*resources and classes.
+*
+* @author Marc Fleury
+* @author Christoph G. Jung
+* @version $Revision: 1.10 $
+*
+* 20010830 marc fleury:
+*
+* Initial import
+*
+* 20011009 cgj:
+*
+* fixed default resolution behaviour
+*
+*/
public class URLClassLoader
- extends java.net.URLClassLoader
- implements URLClassLoaderMBean
+extends java.net.URLClassLoader
+implements URLClassLoaderMBean
{
/** One URL per classLoader in our case
-* This is just a key used for identifying the classloader,
-* nothing is actually loaded from it. Classes and resources are
-* loaded from local copies or unpacked local copies.
-*/
+ * This is just a key used for identifying the classloader,
+ * nothing is actually loaded from it. Classes and resources are
+ * loaded from local copies or unpacked local copies.
+ */
private URL keyUrl = null;
-
+
/** An SCL can also be loading on behalf of an MBean */
-//private ObjectName mbean = null; not used
-
+ //private ObjectName mbean = null; not used
+
/** All SCL are just in orbit around a basic ServiceLibraries */
private static ServiceLibraries libraries;
- /** The bootstrap interface to the log4j system */
- private static BootstrapLogger log =
BootstrapLogger.getLogger(URLClassLoader.class);
-
+ /** The bootstrap interface to the log4j system */
+ private static BootstrapLogger log =
BootstrapLogger.getLogger(URLClassLoader.class);
+
/**
-* One url per SCL
-*
-* @param String application
-* @param ClassLoader parent
-*/
+ * One url per SCL
+ *
+ * @param String application
+ * @param ClassLoader parent
+ */
public URLClassLoader(URL[] urls, URL keyUrl)
{
super(urls);
this.keyUrl = keyUrl;
try
{
-
+
if (libraries == null)
{
libraries = ServiceLibraries.getLibraries();
}
-
+
// A URL enabled SCL must register itself with the libraries to
// be queried
libraries.addClassLoader(this);
@@ -77,77 +77,72 @@
log.warn("URL "+keyUrl+" could not be opened");
}
}
-
+
public URL getKeyURL()
{
return keyUrl;
}
-
+
/**
-* loadClass
-*
-* We intercept the load class to know exactly the dependencies
-* of the underlying jar
-*/
-
+ * loadClass
+ *
+ * We intercept the load class to know exactly the dependencies
+ * of the underlying jar
+ */
+
+
+ /*
+ USE THIS TO TRACE CLASS LOADING
+ if (name.endsWith("CHANGEME"))
+ {
+ log.debug("UCL LOAD "+this.hashCode()+" in loadClass "+name);
+ }
+ */
+
public Class loadClass(String name, boolean resolve)
- throws ClassNotFoundException
+ throws ClassNotFoundException
{
- if (name.endsWith("CHANGEME"))
- {
- log.debug("UCL LOAD "+this.hashCode()+" in loadClass "+name);
- }
-
return libraries.loadClass(name, resolve, this);
}
-
[JBoss-dev] CVS update: jboss/src/main/org/jboss/jms/asf StdServerSessionPool.java
User: mnf999
Date: 01/12/18 22:22:23
Modified:src/main/org/jboss/jms/asf StdServerSessionPool.java
Log:
more init->create
Revision ChangesPath
1.17 +3 -3 jboss/src/main/org/jboss/jms/asf/StdServerSessionPool.java
Index: StdServerSessionPool.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/jms/asf/StdServerSessionPool.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StdServerSessionPool.java 2001/12/13 13:32:05 1.16
+++ StdServerSessionPool.java 2001/12/19 06:22:23 1.17
@@ -37,7 +37,7 @@
*
* @authormailto:[EMAIL PROTECTED]";>Peter Antman .
* @authormailto:[EMAIL PROTECTED]";>Hiram Chirino .
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public class StdServerSessionPool
implements ServerSessionPool
@@ -161,7 +161,7 @@
});
// finish initializing the session
- init();
+ create();
log.debug("Server Session pool set up");
}
@@ -323,7 +323,7 @@
// --- Private methods used internally
- private void init() throws JMSException
+ private void create() throws JMSException
{
for (int index = 0; index < poolSize; index++)
{
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceCreator.java
User: mnf999
Date: 01/12/18 22:34:08
Modified:src/main/org/jboss/system ServiceCreator.java
Log:
Revision ChangesPath
1.8 +132 -116 jboss/src/main/org/jboss/system/ServiceCreator.java
Index: ServiceCreator.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceCreator.java 2001/12/09 03:36:01 1.7
+++ ServiceCreator.java 2001/12/19 06:34:08 1.8
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.system;
import java.lang.reflect.Constructor;
@@ -24,7 +24,7 @@
* @see Service
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*
* Revisions:
* 2001/08/03 marcf
@@ -38,46 +38,47 @@
/** Instance logger. */
private final Logger log = Logger.getLogger(getClass());
-
+
private MBeanServer server;
-
+
public ServiceCreator(final MBeanServer server) {
this.server = server;
}
-
+
/**
-* Parses the given configuration document and creates MBean
-* instances in the current MBean server.
-*
-* @param configuration The configuration document.
-*
-* @throws ConfigurationException The configuration document contains
-* invalid or missing syntax.
-* @throws ExceptionFailed for some other reason.
-*/
- public ObjectInstance create(Element mbeanElement) throws Exception
+ * Parses the given configuration document and creates MBean
+ * instances in the current MBean server.
+ *
+ * @param configuration The configuration document.
+ *
+ * @throws ConfigurationException The configuration document contains
+ * invalid or missing syntax.
+ * @throws ExceptionFailed for some other reason.
+ */
+ public ObjectInstance install(Element mbeanElement) throws Exception
{
ObjectName name = parseObjectName(mbeanElement);
-
+
// marcf fixme add and remove the classlaoder from the controller
-
+
ObjectName loader = new ObjectName("ZClassLoaders:id="+name.hashCode());
-
+
MBeanClassLoader cl = new MBeanClassLoader(name);
-
+
if (!server.isRegistered(loader))
server.registerMBean(cl, loader);
-
+
// If class is given, instantiate it
String code = mbeanElement.getAttribute("code");
if (code == null)
{
throw new ConfigurationException("missing 'code' attribute");
}
-
+
// get the constructor params/sig to use
ConstructorInfo constructor =
- ConstructorInfo.create(mbeanElement);
+
+ ConstructorInfo.create(mbeanElement);
log.debug("About to create bean: "+name);
// Create the MBean instance
@@ -91,7 +92,7 @@
log.debug("Created bean: "+name);
return instance;
-
+
}
catch (Exception e)
{
@@ -104,66 +105,81 @@
throw e;
} // end of try-catch
+
+ }
+
+
+ public void remove(ObjectName name) throws Exception
+ {
+
+ // Remove the MBean from the MBeanServer
+ server.unregisterMBean(name);
+ // Remove the MBeanClassLoader used by the MBean
+ ObjectName loader = new ObjectName("ZClassLoaders:id=" + name.hashCode());
+ if (server.isRegistered(loader))
+ {
+ server.unregisterMBean(loader);
+ } // end of if ()
}
-
+
/**
-* Provides a wrapper around the information about which constructor
-* that MBeanServer should use to construct a MBean.
-* Please note that only basic datatypes (type is then the same as
-* you use to declare it "short", "int", "float" etc.) and any class
-* having a constructor taking a single "String" as only parameter.
-*
-* XML syntax for contructor:
-*
-*
-*
-* ...
-*
-*
-*
-*/
+ * Provides a wrapper around the information about which constructor
+ * that MBeanServer should use to construct a MBean.
+ * Please note that only basic datatypes (t
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceControllerMBean.java
User: mnf999 Date: 01/12/18 22:30:30 Modified:src/main/org/jboss/system ServiceControllerMBean.java Log: API is create/destroy start/stop for services Revision ChangesPath 1.6 +25 -21jboss/src/main/org/jboss/system/ServiceControllerMBean.java Index: ServiceControllerMBean.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceControllerMBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ServiceControllerMBean.java 2001/11/24 20:54:34 1.5 +++ ServiceControllerMBean.java 2001/12/19 06:30:29 1.6 @@ -9,6 +9,7 @@ import javax.management.ObjectName; import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /** * This is the main Service Controller API. @@ -19,12 +20,18 @@ * @see Service * * @author mailto:[EMAIL PROTECTED]";>Marc Fleury - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * * 20010830 marc fleury: * * Initial import * + * + * 20011211 marc fleury: + * + * API for mbean api install/remove + * API for lifecycle of a service create/start/stop/destroy + * */ public interface ServiceControllerMBean // extends Service @@ -32,34 +39,31 @@ /** The default object name. */ String OBJECT_NAME = "JBOSS-SYSTEM:spine=ServiceController"; - // - // high level calls on the MBean deployment - // + /** Install a service, create the MBean and configure it**/ + ObjectName install(Element mbean) throws Exception; - ObjectName deploy(Element mbean) throws Exception; - - //puts a mbean that you created some other way (such as deployed rar) - //into dependency system so other beans can be started/stopped on its - //existence (or registration) - void registerAndStartService(ObjectName serviceName, String serviceFactory) throws Exception; - void undeploy(Element mbean) throws Exception; - void undeploy(ObjectName mbeanName) throws Exception; - - - void shutdown(); - // - // State calls, init, start, stop, destroy - // + /** Create the service, service needs to be installed **/ + void create(ObjectName mbean) throws Exception; - //void init(ObjectName mbean) throws Exception; - //Are these really useful?? + /** Start the service **/ void start(ObjectName mbean) throws Exception; + + /** Stop the service **/ void stop(ObjectName mbean) throws Exception; - //void destroy(ObjectName mbean) throws Exception; + + /** Destroy the service, corresponds to create **/ + void destroy(ObjectName mbean) throws Exception; + + /** Remove a service, corresponds to install **/ + void remove(Element mbean) throws Exception; + void remove(ObjectName mbeanName) throws Exception; + /** Get a list of deployed elements, in the order they were deployed */ ObjectName[] getDeployed(); /** Get configuration will output an XML file in the array order */ String getConfiguration(ObjectName[] objectNames) throws Exception; + + void shutdown(); } ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceController.java
User: mnf999
Date: 01/12/18 22:26:19
Modified:src/main/org/jboss/system ServiceController.java
Log:
The ServiceController logic, start and stop dependent beans automatically,
simplified logic
Revision ChangesPath
1.17 +494 -518 jboss/src/main/org/jboss/system/ServiceController.java
Index: ServiceController.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceController.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ServiceController.java2001/11/30 15:49:35 1.16
+++ ServiceController.java2001/12/19 06:26:19 1.17
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.system;
@@ -15,6 +15,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.LinkedList;
import java.util.ListIterator;
import java.util.Map;
import javax.management.InstanceNotFoundException;
@@ -31,152 +32,130 @@
import javax.management.RuntimeErrorException;
import javax.management.RuntimeMBeanException;
import javax.management.RuntimeOperationsException;
+
import org.w3c.dom.Element;
import org.jboss.logging.Logger;
/**
- * This is the main Service Controller. A controller can deploy a service to a
- * JBOSS-SYSTEM It installs by delegating, it configures by delegating
- *
- * @see org.jboss.system.Service
- * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @author mailto:[EMAIL PROTECTED]";>David Jencks
- * @version $Revision: 1.16 $
- *
- * Revisions:
- *
- * 20010830 marcf
- *
- * Initial version checked in
- *
- * 20010908 david jencks
- *
- * fixed tabs to spaces and log4j logging. Made it report the number
- * of successes on init etc. Modified to support undeploy and work with
- * .sar dependency management and recursive sar deployment.
- *
- */
+* This is the main Service Controller. A controller can deploy a service to a
+* JBOSS-SYSTEM It installs by delegating, it configures by delegating
+*
+* @see org.jboss.system.Service
+* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+* @author mailto:[EMAIL PROTECTED]";>David Jencks
+* @version $Revision: 1.17 $
+*
+* Revisions:
+*
+* 20010830 marcf
+*
+* Initial version checked in
+*
+* 20010908 david jencks
+*
+* fixed tabs to spaces and log4j logging. Made it report the number
+* of successes on init etc. Modified to support remove and work with
+* .sar dependency management and recursive sar deployment.
+*
+* 2001210 marcf
+*
+* Rewrite
+*
+*/
public class ServiceController
- //extends ServiceMBeanSupport
- implements ServiceControllerMBean, MBeanRegistration
+//extends ServiceMBeanSupport
+implements ServiceControllerMBean, MBeanRegistration
{
-
- private final Logger log = Logger.getLogger(getClass());
-
-
- /**
-* A mapping from the Service interface method names to the corresponding
-* index into the ServiceProxy.hasOp array.
-*/
- private static HashMap serviceOpMap = new HashMap();
- /**
-* Map between mbeans and the mbean references they have
-*/
- private static HashMap mbeanToMBeanRefsMap = new HashMap();
- //inverse map
- private static HashMap mbeanRefToMBeansMap = new HashMap();
-
- /**
-* The set of mbeans that can't find all their mbean references, mapped to
-* the mbeans they can't find.
-*/
- private static HashMap suspendedToMissingMBeanMap = new HashMap();
-
- /**
-* The map between missing mbeans and what is waiting for them :
-* inverse of suspendedToMissingMBeanMap
-*/
- private static HashMap missingToSuspendedMBeanMap = new HashMap();
-
-
- /**
-* Helper classes to create and configure the classes
-*/
- protected ServiceCreator creator;
- /**
-* Description of the Field
-*/
- protected ServiceConfigurator configurator;
-
// Attributes
-
+
+ private final Logger log = Logger.getLogger(getClass());
+
/** A callback to the JMX MBeanServer */
MBeanServer server;
-
- /** The array list keeps the order of deployment. */
- List startedServices = new ArrayList();
- /** The map keeps the list of objectNames to services. */
- Map nameToServiceMap = new HashMap();
-
- // Static
-
+ /** Creator, helper class to instanciate MBeans **/
+ pr
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system ServiceConfigurator.java
User: mnf999 Date: 01/12/18 22:24:41 Modified:src/main/org/jboss/system ServiceConfigurator.java Log: parse the dependencies used by the deployer Revision ChangesPath 1.14 +203 -211 jboss/src/main/org/jboss/system/ServiceConfigurator.java Index: ServiceConfigurator.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceConfigurator.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ServiceConfigurator.java 2001/12/04 18:13:23 1.13 +++ ServiceConfigurator.java 2001/12/19 06:24:41 1.14 @@ -1,9 +1,9 @@ /* - * JBoss, the OpenSource J2EE webOS - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ +* JBoss, the OpenSource J2EE webOS +* +* Distributable under LGPL license. +* See terms of license at gnu.org. +*/ package org.jboss.system; import java.beans.PropertyEditor; @@ -12,6 +12,8 @@ import java.io.Writer; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.util.StringTokenizer; +import java.util.LinkedList; import java.util.ArrayList; import java.util.Hashtable; import javax.management.Attribute; @@ -34,23 +36,23 @@ import org.w3c.dom.Text; /** - * Service configuration helper. - * - * @author mailto:[EMAIL PROTECTED]";>Marc Fleury - * @author mailto:[EMAIL PROTECTED]";>Hiram Chirino - * @version $Revision: 1.13 $ - * - * 20010830 marc fleury: - * - * Initial import - * - * 20010831 hiram chirino: - * - * Added suppport for org.w3c.dom.Element type mbean attributes. - * The first child Element of theis used - * to set the value of the attribute. - * - */ +* Service configuration helper. +* +* @author mailto:[EMAIL PROTECTED]";>Marc Fleury +* @author mailto:[EMAIL PROTECTED]";>Hiram Chirino +* @version $Revision: 1.14 $ +* +* 20010830 marc fleury: +* +* Initial import +* +* 20010831 hiram chirino: +* +* Added suppport for org.w3c.dom.Element type mbean attributes. +* The first child Element of the is used +* to set the value of the attribute. +* +*/ public class ServiceConfigurator { /** Primitive type name -> class map. */ @@ -82,11 +84,11 @@ // Public --- /** -* Builds a string that consists of the configuration elements of -* the currently running MBeans registered in the server. -* -* @throws ExceptionFailed to construct configuration. -*/ + * Builds a string that consists of the configuration elements of + * the currently running MBeans registered in the server. + * + * @throws ExceptionFailed to construct configuration. + */ public String getConfiguration(ObjectName[] objectNames) throws Exception { @@ -154,18 +156,18 @@ // Public - /** -* The configure method configures an mbean based on the xml element configuration -* passed in. Three formats are supported: -* (value) -*(object name of mbean referenced) -*-* [list of] (object name) -* -* -* @param mbeanElement an Element value -* @return a ArrayList of all the mbeans this one references. -* @exception Exception if an error occurs -*/ + * The configure method configures an mbean based on the xml element configuration + * passed in. Three formats are supported: + *(value) + *(object name of mbean referenced) + *+ * [list of] (object name) + * + * + * @param mbeanElement an Element value + * @return a ArrayList of all the mbeans this one references. + * @exception Exception if an error occurs + */ public ArrayList configure(Element mbeanElement) throws Exception { @@ -182,7 +184,6 @@ } catch (InstanceNotFoundException e) { // The MBean is no longer available - // It's ok, just return It is ? Why?? Oh yeah? throw new DeploymentException("trying to configure nonexistent mbean: " + objectName); } @@ -194,181 +195,172 @@ Element attributeElement = (Element)attrs.item(j); String attributeName = attributeElement.getAttribute("name"); attrfound: -i
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/local - New directory
User: mnf999 Date: 01/12/18 22:18:19 jboss/src/main/org/jboss/invocation/local - New directory ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/jmx/connector/rmi TestServer.java
User: mnf999
Date: 01/12/18 22:22:23
Modified:src/main/org/jboss/jmx/connector/rmi TestServer.java
Log:
more init->create
Revision ChangesPath
1.4 +2 -2 jboss/src/main/org/jboss/jmx/connector/rmi/TestServer.java
Index: TestServer.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/jmx/connector/rmi/TestServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestServer.java 2001/10/08 16:53:00 1.3
+++ TestServer.java 2001/12/19 06:22:23 1.4
@@ -80,7 +80,7 @@
);
System.out.println( "Start the Naming Service" );
try {
- lServer.invoke( lNamingName, "init", new Object[] {}, new
String[] {} );
+ lServer.invoke( lNamingName, "create", new Object[] {}, new
String[] {} );
}
catch( MBeanException me ) {
System.err.println( "TestServer.main(), caught: " + me
+
@@ -99,7 +99,7 @@
lConnectorName
);
System.out.println( "Start the Connector" );
- lServer.invoke( lConnectorName, "init", new Object[] {}, new
String[] {} );
+ lServer.invoke( lConnectorName, "create", new Object[] {}, new
String[] {} );
lServer.invoke( lConnectorName, "start", new Object[] {}, new
String[] {} );
System.out.println( "Now open a new Terminal or Command Prompt
and start the connector.jar test client" );
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/jmx/connector TestClient.java
User: mnf999
Date: 01/12/18 22:22:23
Modified:src/main/org/jboss/jmx/connector TestClient.java
Log:
more init->create
Revision ChangesPath
1.4 +1 -1 jboss/src/main/org/jboss/jmx/connector/TestClient.java
Index: TestClient.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/jmx/connector/TestClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestClient.java 2001/10/11 01:41:59 1.3
+++ TestClient.java 2001/12/19 06:22:23 1.4
@@ -126,7 +126,7 @@
// Init and start Factory because all attributes are set
lLocalServer.invoke(
lFactoryInstance.getObjectName(),
- "init",
+ "create",
new Object[] {},
new String[] {}
);
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/system Service.java
User: mnf999
Date: 01/12/18 22:23:04
Modified:src/main/org/jboss/system Service.java
Log:
Back by popular demand, init as create(), rock and roll
Revision ChangesPath
1.4 +20 -3 jboss/src/main/org/jboss/system/Service.java
Index: Service.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/Service.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Service.java 2001/11/12 06:52:17 1.3
+++ Service.java 2001/12/19 06:23:04 1.4
@@ -10,7 +10,7 @@
* The Service interface for the JBOSS-SYSTEM.
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* 20010830 marc fleury:
*
@@ -20,14 +20,31 @@
*
* removed init and destroy methods
*
+ * 20011208 marc fleury:
+ *
+ * init and destroy were put back by david
+ * init becomes create
+ *
*/
public interface Service
{
+ /**
+* create the service, do expensive operations etc
+*/
+ void create() throws Exception;
+
+ /**
+* start the service, create is already called
+*/
void start() throws Exception;
+ /**
+* stop the service
+*/
void stop();
- //well I tried... maybe later.
- void init() throws Exception;
+ /**
+* destroy the service, tear down
+*/
void destroy();
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation MarshalledInvocation.java
User: mnf999
Date: 01/12/18 22:13:27
Added: src/main/org/jboss/invocation MarshalledInvocation.java
Log:
The second beasty, the marshalled invocation takes any payload and serializes it,
the point of all this is that we don't need to deserialize the payload until we need it
Revision ChangesPath
1.1 jboss/src/main/org/jboss/invocation/MarshalledInvocation.java
Index: MarshalledInvocation.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.invocation;
import java.util.Map;
import java.util.Iterator;
import java.util.HashMap;
import java.util.WeakHashMap;
import java.lang.reflect.Method;
import java.io.DataOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.rmi.MarshalledObject;
import java.security.Principal;
import java.security.MessageDigest;
import java.security.DigestOutputStream;
import org.jboss.invocation.Invocation;
/*
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.HashMap;
import java.security.Principal;
import java.security.MessageDigest;
import java.security.DigestOutputStream;
import javax.transaction.Transaction;
*/
/**
*
* The MarshalledInvocation is an invocation that travels. As such it serializes its
payload because of lack of ClassLoader visibility.
* As such it contains Marshalled data representing the byte[] of the Invocation
object it extends
* Besides handling the specifics of "marshalling" the payload, which could be done
at the Invocation level
* the Marshalled Invocation can hold optimization and needed code for distribution
for example the
* TransactionPropagationContext which is a serialization of the TX for distribution
purposes as
* well as the "hash" for the methods that we send, as opposed to sending Method
objects.
* Serialization "optimizations" should be coded here in the externalization
implementation of the class
*
* @see
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @version $Revision: 1.1 $
* Revisions:
*
* Revisions:
*
* 2001120 marc fleury:
*
*Initial check-in
*
*/
public class MarshalledInvocation
extends Invocation
implements java.io.Externalizable
{
// Constants -
/** Serial Version Identifier. */
// FIXME TODO
// The Transaction Propagation Context for distribution
Object tpc;
// The Map of methods used by this Invocation
transient Map methodMap;
// Static
static Map hashMap = new WeakHashMap();
/**
* Calculate method hashes. This algo is taken from RMI.
*
* @param intf
* @return
*/
public static Map getInterfaceHashes(Class intf, boolean methodToLong)
{
// Create method hashes
Method[] methods = intf.getDeclaredMethods();
HashMap map = new HashMap();
for (int i = 0; i < methods.length; i++)
{
Method method = methods[i];
Class[] parameterTypes = method.getParameterTypes();
String methodDesc = method.getName()+"(";
for(int j = 0; j < parameterTypes.length; j++)
{
methodDesc += getTypeString(parameterTypes[j]);
}
methodDesc += ")"+getTypeString(method.getReturnType());
try
{
long hash = 0;
ByteArrayOutputStream bytearrayoutputstream = new
ByteArrayOutputStream(512);
MessageDigest messagedigest = MessageDigest.getInstance("SHA");
DataOutputStream dataoutputstream = new DataOutputStream(new
DigestOutputStream(bytearrayoutputstream, messagedigest));
dataoutputstream.writeUTF(methodDesc);
dataoutputstream.flush();
byte abyte0[] = messagedigest.digest();
for(int j = 0; j < Math.min(8, abyte0.length); j++)
hash += (long)(abyte0[j] & 0xff) << j * 8;
if (methodToLong)
map.put(method, new Long(hash));
else
map.put(new Long(hash), method);
} catch (Exception e)
{
e.printStackTrace();
}
}
return map;
}
static String getTypeStri
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation Invocation.java
User: mnf999
Date: 01/12/18 22:08:52
Modified:src/main/org/jboss/invocation Invocation.java
Log:
The real deal, the first reader of payload is the "invocation" see
marshalledInvocation for advanced travelling readers.
Revision ChangesPath
1.2 +108 -114 jboss/src/main/org/jboss/invocation/Invocation.java
Index: Invocation.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/invocation/Invocation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Invocation.java 2001/11/14 16:43:19 1.1
+++ Invocation.java 2001/12/19 06:08:52 1.2
@@ -17,15 +17,21 @@
/**
* The Invocation object is the generic object flowing through our interceptors
*
+* The heart of it is the payload map that can contain anything we then put
readers on them
+* The first "reader" is this "Invocation" object that can interpret the data in
it.
+*
+* Essentially we can carry ANYTHING from the client to the server, we keep a
series of
+* of predifined variables and method calls to get at the pointers. But really it
is just
+* a repository of objects.
*
* @see
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
-* @version $Revision: 1.1 $
+* @version $Revision: 1.2 $
* Revisions:
*
* Revisions:
*
-* 20211002 marc fleury:
+* 2001114 marc fleury:
*
*Initial check-in
*
@@ -33,148 +39,136 @@
public class Invocation
{
-
- // Attributes
-
- /**
-* The transaction of this invocation.
-*/
- public Transaction tx;
-
- /**
-* The security identity of this invocation.
-*/
- public Principal identity;
-
- /**
-* The security credentials of this invocation.
-*/
- public Object credential;
-
-
- /**
- * The linked list of object names, in String form, that the invocation must go
through
- * Should move to a real linked list in the future (so we don't have to update
the full
- * variable to include new interceptor flows
- * We could keep track of the mbeans to see in this object with an incremented
index
- * there would be no central intelligence but this "invocation" that knows where
to go next
- */
- public String[] mbeans;
+ // Attributes
/**
-* The payload is a repository of everything associated with the invocation
-* with the exception of the generic transaction and security information above.
-*/
+ * The payload is a repository of everything associated with the invocation
+ * with the exception of the generic transaction and security information above.
+ */
public Map payload;
+
-
// Static
-
-
- /*
- * We are using the generic payload to store some of our data, we define the
integer entries.
+
+
+ /**
+ * We are using the generic payload to store some of our data, we define some
integer entries.
+ * These are just some variables that we define for use in "typed" getters and
setters.
+ * One can define anything either in here explicitely or through the use of
external calls to getValue
*/
public static final Integer
- METHOD = new Integer(new String("METHOD").hashCode()),
- ARGUMENTS = new Integer(new String("ARGUMENTS").hashCode());
-
+ // Transactional information with the invocation
+ TRANSACTION = new Integer(new String("TRANSACTION").hashCode()),
+ PRINCIPAL = new Integer(new String("PRINCIPAL").hashCode()),
+ CREDENTIAL = new Integer(new String("CREDENTIAL").hashCode()),
+
+ // We can keep a reference to an abstract "container" this invocation is
associated with
+ CONTAINER = new Integer(new String("CONTAINER").hashCode()),
+ // The type can be any qualifier for the invocation, anything (used in EJB)
+ TYPE = new Integer(new String("TYPE").hashCode()),
+ // The Cache-ID associates an instance in cache somewhere on the server with
this invocation
+ CACHE_ID = new Integer(new String("CACHE_ID").hashCode()),
+ // The invocation can be a method invocation, we give the method to call
+ METHOD = new Integer(new String("METHOD").hashCode()),
+ // The arguments of the method to call
+ ARGUMENTS = new Integer(new String("ARGUMENTS").hashCode()),
+ // Enterprise context
+ ENTERPRISE_CONTEXT = new Integer(new String("ENTERPRISE_CONTEXT").hashCode());
+
// Constructors --
-
- /**
-* Invocation creation
-*/
- public Invocation(Transaction tx,
- Principal identity,
-
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation Invoker.java
User: mnf999
Date: 01/12/18 22:12:06
Added: src/main/org/jboss/invocation Invoker.java
Log:
the interface for the node invokers, trivial really, all there is to it is an
adapter to the JMX node behind it but these present the "Invocation" face
Revision ChangesPath
1.1 jboss/src/main/org/jboss/invocation/Invoker.java
Index: Invoker.java
===
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.invocation;
import java.rmi.Remote;
/**
* This invoker carries Invocation in the JMX target node.
* The interface in the current JBoss can be implemented with Remote/local switches
or
* with clustered invokers, this interface just masks the network details and the
topology
* of the JMX nodes for the client proxies.
*
* @see
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @version $Revision: 1.1 $
* Revisions:
*
* Revisions:
*
* 2004 marc fleury:
*
*Initial check-in
*
*/
public interface Invoker
extends Remote
{
// Public
/**
* The time when this class was initialized. Used to
* determine if this instance lives in the same VM as the container.
*/
long STARTUP = System.currentTimeMillis();
/**
* A free form String identifier for this delegate invoker, can be clustered or
target node
* This should evolve in a more advanced meta-inf object
*/
public String getServerHostName()
throws Exception;
/**
* The invoke with an Invocation Object
* the delegate can handle network protocols on behalf of proxies (proxies
delegate to these puppies)
* We provide default implemenations with JRMP/Local/Clustered invokers.
* The delegates are not tied to a type of invocation (EJB or generic RMI).
*
* @param invocation A pointer to the invocation object
*
* @return Return value of method invocation.
*
* @throws ExceptionFailed to invoke method.
*/
public Object invoke(Invocation invocation)
throws Exception;
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/invocation/jrmp - New directory
User: mnf999 Date: 01/12/18 22:18:19 jboss/src/main/org/jboss/invocation/jrmp - New directory ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] MarshalledInvocation
carries serialized payload, deep into the container land, all in "cargo" until you need to deserialize it, so really the invocation is detyped, so much that the actual payload is serialized. FIXME: right now I serialize everything with MarshalledObject, we might want to remove that and use the private outputstream with CL that we were discussing earlier with Francisco (for memory) as well as not serialize everything (mostly java.lang doesn't need) but I am not sure this last move would really give speed increases (need to try) This MI is the one that can travel, and it works from the Invocation by manipulating the hashmap payload and providing the reader for it and MO versions of it. remember I love you marcf Marc Fleury President JBoss Group, LLC ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] new invocation
the simple version is that you want to pay attention to the hashmap in "Invocation". SCOTT, be careful I don't do "enterprise context" work in there anymore and these should be done in the interceptors, I removed an old "fixme" that was in there about the wiring of the principal to the context... FYI marcf Marc Fleury President JBoss Group, LLC ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] Lighting factory in China--seeking business cooperation
On Wed, 19 Dec 2001, marc fleury wrote: > we are attracting all kinds of leeches these days but this is frankly > un-expected... s/leech/spammer/ Fucking spammers. I have just recently installed a program called spamassassin(1). Seems fairly good, and doesn't have too many false hits. 1: http://spamassassin.taint.org/ ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/lock BeanLockSupport.java MethodOnlyEJBLock.java QueuedPessimisticEJBLock.java SimplePessimisticEJBLock.java
User: mnf999
Date: 01/12/18 22:04:48
Modified:src/main/org/jboss/ejb/plugins/lock BeanLockSupport.java
MethodOnlyEJBLock.java
QueuedPessimisticEJBLock.java
SimplePessimisticEJBLock.java
Log:
MI->Invocation
Revision ChangesPath
1.9 +4 -4 jboss/src/main/org/jboss/ejb/plugins/lock/BeanLockSupport.java
Index: BeanLockSupport.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/lock/BeanLockSupport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BeanLockSupport.java 2001/11/26 03:12:29 1.8
+++ BeanLockSupport.java 2001/12/19 06:04:48 1.9
@@ -13,7 +13,7 @@
import javax.ejb.EJBObject;
import org.jboss.ejb.BeanLock;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.logging.Logger;
@@ -22,7 +22,7 @@
*
* @author Bill Burke
* @author Marc Fleury
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*
* Revisions:
* 2001/07/29: marcf
@@ -91,7 +91,7 @@
}
}
- public abstract void schedule(MethodInvocation mi) throws Exception;
+ public abstract void schedule(Invocation mi) throws Exception;
/**
* The setTransaction associates a transaction with the lock.
@@ -138,7 +138,7 @@
}
}
- protected boolean isCallAllowed(MethodInvocation mi)
+ protected boolean isCallAllowed(Invocation mi)
{
// is this a reentrant bean
if (reentrant)
1.4 +4 -4 jboss/src/main/org/jboss/ejb/plugins/lock/MethodOnlyEJBLock.java
Index: MethodOnlyEJBLock.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/lock/MethodOnlyEJBLock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MethodOnlyEJBLock.java2001/11/24 20:43:28 1.3
+++ MethodOnlyEJBLock.java2001/12/19 06:04:48 1.4
@@ -10,7 +10,7 @@
import javax.transaction.Transaction;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
/**
* This class does not perform any pessimistic transactional locking. Only locking
@@ -24,7 +24,7 @@
*
* @author Bill Burke
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* Revisions:
* 2001/08/08: billb
@@ -35,7 +35,7 @@
public class MethodOnlyEJBLock extends QueuedPessimisticEJBLock
{
/**
-* Schedule(MethodInvocation)
+* Schedule(Invocation)
*
* Schedule implements a particular policy for scheduling the threads coming in.
* There is always the spec required "serialization" but we can add custom
scheduling in here
@@ -44,7 +44,7 @@
* release of the lock. Schedulation must return with lock.
*
*/
- public void schedule(MethodInvocation mi)
+ public void schedule(Invocation mi)
throws Exception
{
Transaction miTx = mi.getTransaction();
1.7 +6 -6
jboss/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
Index: QueuedPessimisticEJBLock.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QueuedPessimisticEJBLock.java 2001/11/24 20:43:28 1.6
+++ QueuedPessimisticEJBLock.java 2001/12/19 06:04:48 1.7
@@ -13,7 +13,7 @@
import javax.transaction.Transaction;
import javax.transaction.Status;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
/**
@@ -36,7 +36,7 @@
* @author Marc Fleury
* @author Bill Burke
*
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*
* Revisions:
* 2001/08/03: billb
@@ -128,7 +128,7 @@
}
- public void schedule(MethodInvocation mi) throws Exception
+ public void schedule(Invocation mi) throws Exception
{
boolean threadScheduled = false;
while (!threadScheduled)
@@ -138,7 +138,7 @@
}
}
/**
-* doSchedule(MethodInvocation)
+* doSchedule(Invocation)
*
* doSchedule implements a particular policy for scheduling the threads coming
in.
* There is always the spec required "serialization" but we can add custom
scheduling in here
@@ -147,7 +147,7 @@
* release of the lock. Schedulation must return with lock.
*
*/
- protected boolean doSchedule(MethodInvocation mi)
+ protected boolean doSchedule(Invocation mi)
throws Except
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/local BaseLocalContainerInvoker.java
User: mnf999
Date: 01/12/18 22:03:09
Modified:src/main/org/jboss/ejb/plugins/local
BaseLocalContainerInvoker.java
Log:
invocation usage
Revision ChangesPath
1.16 +53 -15
jboss/src/main/org/jboss/ejb/plugins/local/BaseLocalContainerInvoker.java
Index: BaseLocalContainerInvoker.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/local/BaseLocalContainerInvoker.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BaseLocalContainerInvoker.java2001/11/26 03:12:29 1.15
+++ BaseLocalContainerInvoker.java2001/12/19 06:03:09 1.16
@@ -6,18 +6,23 @@
*/
package org.jboss.ejb.plugins.local;
+import java.awt.Component;
+import java.beans.beancontext.BeanContextChildComponentProxy;
+import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
+import java.util.Properties;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import org.jboss.ejb.LocalHomeObjectFactory;
+import javax.ejb.EJBMetaData;
import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
import javax.ejb.AccessLocalException;
@@ -40,17 +45,27 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.deployment.DeploymentException;
-import org.jboss.logging.Logger;
-import org.jboss.ejb.MethodInvocation;
-import org.jboss.ejb.plugins.jrmp.interfaces.RemoteMethodInvocation;
+import org.jboss.invocation.Invocation;
+import org.jboss.invocation.MarshalledInvocation;
import org.jboss.ejb.Container;
import org.jboss.ejb.ContainerInvokerContainer;
+import org.jboss.ejb.Interceptor;
import org.jboss.ejb.LocalContainerInvoker;
+import org.jboss.proxy.ejb.EJBMetaDataImpl;
import org.jboss.ejb.CacheKey;
-import org.jboss.security.SecurityAssociation;
+import org.jboss.ejb.LocalHomeObjectFactory;
+
import org.jboss.tm.TransactionPropagationContextFactory;
+import org.jboss.security.SecurityAssociation;
+
+import org.jboss.logging.Logger;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.metadata.MetaData;
+import org.jboss.metadata.EntityMetaData;
+import org.jboss.metadata.SessionMetaData;
+
/**
*
@@ -91,8 +106,8 @@
{
this.container = con;
}
-
- public void init()
+ /*
+ public void create()
throws Exception
{
if (((ContainerInvokerContainer)container).getLocalClass() == null)
@@ -110,17 +125,40 @@
Method[] methods =
((ContainerInvokerContainer)container).getLocalClass().getMethods();
beanMethodInvokerMap = new HashMap();
for (int i = 0; i < methods.length; i++)
- beanMethodInvokerMap.put(new
Long(RemoteMethodInvocation.calculateHash(methods[i])), methods[i]);
+ beanMethodInvokerMap.put(new
Long(MarshalledInvocation.calculateHash(methods[i])), methods[i]);
methods =
((ContainerInvokerContainer)container).getLocalHomeClass().getMethods();
homeMethodInvokerMap = new HashMap();
for (int i = 0; i < methods.length; i++)
- homeMethodInvokerMap.put(new
Long(RemoteMethodInvocation.calculateHash(methods[i])), methods[i]);
+ homeMethodInvokerMap.put(new
Long(MarshalledInvocation.calculateHash(methods[i])), methods[i]);
}
-
+*/
+ public void create() throws Exception {}
+ public void destroy(){}
public void start()
throws Exception
{
+ if (((ContainerInvokerContainer)container).getLocalClass() == null)
+ return;
+
+ Context ctx = new InitialContext();
+
+ jndiName = container.getBeanMetaData().getJndiName();
+
+ // Set the transaction manager and transaction propagation
+ // context factory of the GenericProxy class
+ transactionManager =
((TransactionManager)ctx.lookup("java:/TransactionManager"));
+
+ // Create method mappings for container invoker
+ Method[] methods =
((ContainerInvokerContainer)container).getLocalClass().getMethods();
+ beanMethodInvokerMap = new HashMap();
+ for (int i = 0; i < methods.length; i++)
+ beanMethodInvokerMap.put(new
Long(MarshalledInvocation.calculateHash(methods[i])), methods[i]);
+
+ methods =
((ContainerInvokerContainer)container).getLocalHomeClass().getMethods();
+ homeMethodInvokerMap = new HashMap();
+ for (int i = 0; i < methods.length; i++)
+ homeMethodInvokerMap.put(new
Long(Ma
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jms JMSContainerInvoker.java
User: mnf999
Date: 01/12/18 21:58:00
Modified:src/main/org/jboss/ejb/plugins/jms JMSContainerInvoker.java
Log:
Revision ChangesPath
1.36 +434 -426
jboss/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java
Index: JMSContainerInvoker.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- JMSContainerInvoker.java 2001/12/13 13:25:32 1.35
+++ JMSContainerInvoker.java 2001/12/19 05:58:00 1.36
@@ -1,15 +1,16 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.ejb.plugins.jms;
import java.lang.reflect.Method;
import java.security.Principal;
import java.util.Collection;
import java.util.Hashtable;
+
import javax.ejb.EJBHome;
import javax.ejb.EJBMetaData;
import javax.ejb.EJBObject;
@@ -30,7 +31,10 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.ejb.Container;
import org.jboss.ejb.ContainerInvoker;
-import org.jboss.ejb.MethodInvocation;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.invocation.Invocation;
+
import org.jboss.logging.Logger;
import org.jboss.jms.ConnectionFactoryHelper;
import org.jboss.jms.asf.ServerSessionPoolFactory;
@@ -43,244 +47,247 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
/**
- * ContainerInvoker for JMS MessageDrivenBeans, based on JRMPContainerInvoker.
- *
- * @authormailto:[EMAIL PROTECTED]";>Peter Antman .
- * @authormailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @authormailto:[EMAIL PROTECTED]";>Sebastien Alborini
- *
- * @authormailto:[EMAIL PROTECTED]";>Marc Fleury
- * @authormailto:[EMAIL PROTECTED]";>Jason Dillon
- * @version $Revision: 1.35 $
- */
+* ContainerInvoker for JMS MessageDrivenBeans, based on JRMPContainerInvoker.
+*
+* @authormailto:[EMAIL PROTECTED]";>Peter Antman .
+* @authormailto:[EMAIL PROTECTED]";>Rickard Öberg
+* @authormailto:[EMAIL PROTECTED]";>Sebastien Alborini
+* @authormailto:[EMAIL PROTECTED]";>Marc Fleury
+* @authormailto:[EMAIL PROTECTED]";>Jason Dillon
+* @version $Revision: 1.36 $
+* 20011219 marc fleury
+*
+* use of the container invoker here is silly and a good example of why the
proxy generation is not mixed with invokers now
+*
+*/
public class JMSContainerInvoker
- implements ContainerInvoker, XmlLoadable
+implements ContainerInvoker, XmlLoadable
{
// Constants -
-
+
/**
-* {@link MessageListener#onMessage} reference.
-*/
+ * {@link MessageListener#onMessage} reference.
+ */
/*
-* final
-*/
+ * final
+ */
protected static Method ON_MESSAGE;
-
+
/**
-* Default destination type. Used when no message-driven-destination is given
-* in ejb-jar, and a lookup of destinationJNDI from jboss.xml is not
-* successfull. Default value: javax.jms.Topic.
-*/
+ * Default destination type. Used when no message-driven-destination is given
+ * in ejb-jar, and a lookup of destinationJNDI from jboss.xml is not
+ * successfull. Default value: javax.jms.Topic.
+ */
protected final static String DEFAULT_DESTINATION_TYPE = "javax.jms.Topic";
-
+
// Attributes
-
+
/**
-* Description of the Field
-*/
+ * Description of the Field
+ */
protected boolean optimize;
// = false;
/**
-* Maximu number provider is allowed to stuff into a session.
-*/
+ * Maximu number provider is allowed to stuff into a session.
+ */
protected int maxMessagesNr = 1;
/**
-* Maximun pool size of server sessions.
-*/
+ * Maximun pool size of server sessions.
+ */
protected int maxPoolSize = 15;
/**
-* Time to wait before retrying to reconnect a lost connection.
-*/
+ * Time to wait before retrying to reconnect a lost connection.
+ */
protected long reconnectInterval = 1;
/**
-* If Dead letter queue should be used or not.
-*/
+ * If Dead letter queue should be used or not.
+ */
protected boolean useDLQ = false;
/**
-* JNDI name of the provider adapter.
-* @see org.jboss.jms.jndi.JMSProviderAdapter
-*/
+ * JNDI name of the provider adapter.
+ * @see org.jboss.jms.jndi.JMSProviderAdapter
+ */
protected String providerAdap
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jms DLQHandler.java
User: mnf999
Date: 01/12/18 21:54:10
Modified:src/main/org/jboss/ejb/plugins/jms DLQHandler.java
Log:
init->create
Revision ChangesPath
1.5 +3 -3 jboss/src/main/org/jboss/ejb/plugins/jms/DLQHandler.java
Index: DLQHandler.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jms/DLQHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DLQHandler.java 2001/12/14 02:21:45 1.4
+++ DLQHandler.java 2001/12/19 05:54:09 1.5
@@ -52,7 +52,7 @@
* Created: Thu Aug 23 21:17:26 2001
*
* @author
- * @version $Revision: 1.4 $ $Date: 2001/12/14 02:21:45 $
+ * @version $Revision: 1.5 $ $Date: 2001/12/19 05:54:09 $
*/
public class DLQHandler
{
@@ -114,8 +114,8 @@
*
* @throws ExceptionService failed to initalize.
*/
- void init() throws Exception
- {
+ void create() throws Exception {
+
Context ctx = new InitialContext();
QueueConnectionFactory factory = (QueueConnectionFactory)
ctx.lookup(FACTORY_JNDI);
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jaws/metadata JawsApplicationMetaData.java JawsXmlFileLoader.java
User: mnf999
Date: 01/12/18 21:51:24
Modified:src/main/org/jboss/ejb/plugins/jaws/metadata
JawsApplicationMetaData.java JawsXmlFileLoader.java
Log:
pure init->create move
Revision ChangesPath
1.13 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsApplicationMetaData.java
Index: JawsApplicationMetaData.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsApplicationMetaData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JawsApplicationMetaData.java 2001/11/26 03:12:28 1.12
+++ JawsApplicationMetaData.java 2001/12/19 05:51:24 1.13
@@ -32,7 +32,7 @@
*
* @see
* @author Sebastien Alborini
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*
* Revisions:
*
@@ -83,7 +83,7 @@
// initialisation of this object goes as follows:
// - constructor
// - importXml() for standardjaws.xml and jaws.xml
- // - init()
+ // - create()
// the classloader is the same for all the beans in the application
classLoader = cl;
@@ -127,7 +127,7 @@
return (JawsEntityMetaData)entities.get(name);
}
- public void init()
+ public void create()
throws DeploymentException
{
// find the datasource
1.10 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsXmlFileLoader.java
Index: JawsXmlFileLoader.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsXmlFileLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JawsXmlFileLoader.java2001/11/26 03:12:28 1.9
+++ JawsXmlFileLoader.java2001/12/19 05:51:24 1.10
@@ -21,7 +21,7 @@
*
* @see
* @author Sebastien Alborini
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*
* Revisions:
*
@@ -78,7 +78,7 @@
}
// this can only be done once all the beans are built
- jamd.init();
+ jamd.create();
return jamd;
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc JDBCAbstractQueryCommand.java JDBCReadAheadInterceptor.java JDBCRelationInterceptor.java JDBCStoreManager.java
User: mnf999
Date: 01/12/18 21:50:12
Modified:src/main/org/jboss/ejb/plugins/cmp/jdbc
JDBCAbstractQueryCommand.java
JDBCReadAheadInterceptor.java
JDBCRelationInterceptor.java JDBCStoreManager.java
Log:
using the new Invocation and create()
Revision ChangesPath
1.4 +1 -8
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCAbstractQueryCommand.java
Index: JDBCAbstractQueryCommand.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCAbstractQueryCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCAbstractQueryCommand.java 2001/12/17 18:59:13 1.3
+++ JDBCAbstractQueryCommand.java 2001/12/19 05:50:11 1.4
@@ -42,7 +42,7 @@
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Joe Shevland
* @author mailto:[EMAIL PROTECTED]";>Justin Forder
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class JDBCAbstractQueryCommand implements JDBCQueryCommand {
private JDBCStoreManager manager;
@@ -155,14 +155,7 @@
} else {
ContainerInvoker invoker;
invoker = container.getContainerInvoker();
- try {
return invoker.getEntityCollection(finderResults);
- } catch(RemoteException e) {
-// this won't happen as the container invokers
-// don't actuall throw exceptions for this method
-// and this method does nothing remote
-throw new FinderException("Error obtaining ejbs: " + e);
- }
}
}
1.3 +5 -5
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCReadAheadInterceptor.java
Index: JDBCReadAheadInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCReadAheadInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCReadAheadInterceptor.java 2001/11/24 22:31:09 1.2
+++ JDBCReadAheadInterceptor.java 2001/12/19 05:50:11 1.3
@@ -12,11 +12,11 @@
import org.jboss.ejb.EntityContainer;
import org.jboss.ejb.EntityPersistenceStore;
import org.jboss.ejb.EntityEnterpriseContext;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.ListCacheKey;
import org.jboss.ejb.plugins.AbstractInterceptor;
import org.jboss.ejb.plugins.CMPPersistenceManager;
-import org.jboss.ejb.plugins.jrmp.interfaces.ReadAheadResult;
+import org.jboss.proxy.ejb.ReadAheadResult;
import org.jboss.util.CachePolicy;
import org.jboss.util.FinderResults;
@@ -26,7 +26,7 @@
* then invokes the given method on the container for all of them, gathers results
and returns them.
*
* @author mailto:[EMAIL PROTECTED]";>Oleg Nitz
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JDBCReadAheadInterceptor extends AbstractInterceptor {
// Constants -
@@ -53,7 +53,7 @@
// Interceptor implementation --
- public Object invoke(MethodInvocation mi) throws Exception {
+ public Object invoke(Invocation mi) throws Exception {
Object result = null;
if ((mi.getId() instanceof ListCacheKey) && (container instanceof
EntityContainer) &&
@@ -80,7 +80,7 @@
//storeManager.loadEntities(results, from, to);
rar.setMainResult(getNext().invoke(mi));
for (int i = from; i < to; i++) {
- rar.addAheadResult(container.invoke(new MethodInvocation(
+ rar.addAheadResult(container.invoke(new Invocation(
new CacheKey(ids.get(i)), mi.getMethod(), mi.getArguments(),
mi.getTransaction(), mi.getPrincipal(),
mi.getCredential(;
}
1.9 +3 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCRelationInterceptor.java
Index: JDBCRelationInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCRelationInterceptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCRelationInterceptor.java 2001/12/01 21:55:05 1.8
+++ JDBCRelationInterceptor.java 2001/12/19 05:50:12 1.9
@@ -17,7 +17,7 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.EntityContainer;
import org.jboss.ejb.EntityEnterpriseContext;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invo
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge JDBCCMRFieldBridge.java
User: mnf999
Date: 01/12/18 21:50:12
Modified:src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge
JDBCCMRFieldBridge.java
Log:
using the new Invocation and create()
Revision ChangesPath
1.18 +5 -5
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMRFieldBridge.java
Index: JDBCCMRFieldBridge.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMRFieldBridge.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JDBCCMRFieldBridge.java 2001/12/12 19:47:05 1.17
+++ JDBCCMRFieldBridge.java 2001/12/19 05:50:12 1.18
@@ -23,7 +23,7 @@
import org.jboss.ejb.EntityContainer;
import org.jboss.ejb.EntityEnterpriseContext;
import org.jboss.ejb.LocalContainerInvoker;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.plugins.CMPPersistenceManager;
import org.jboss.ejb.plugins.EntityInstanceCache;
import org.jboss.ejb.plugins.cmp.bridge.CMRFieldBridge;
@@ -47,7 +47,7 @@
* One for each role that entity has.
*
* @author mailto:[EMAIL PROTECTED]";>Dain Sundstrom
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class JDBCCMRFieldBridge implements CMRFieldBridge {
// -- Invocation messages --
@@ -595,7 +595,7 @@
EntityInstanceCache instanceCache =
(EntityInstanceCache)manager.getContainer().getInstanceCache();
- return manager.getContainer().invoke(new MethodInvocation(
+ return manager.getContainer().invoke(new Invocation(
instanceCache.createCacheKey(myId),
GET_RELATED_ID,
new Object[] { this },
@@ -622,7 +622,7 @@
EntityInstanceCache instanceCache =
(EntityInstanceCache)manager.getContainer().getInstanceCache();
- manager.getContainer().invoke(new MethodInvocation(
+ manager.getContainer().invoke(new Invocation(
instanceCache.createCacheKey(myId),
ADD_RELATION,
new Object[] { this, relatedId },
@@ -649,7 +649,7 @@
EntityInstanceCache instanceCache =
(EntityInstanceCache)manager.getContainer().getInstanceCache();
- manager.getContainer().invoke(new MethodInvocation(
+ manager.getContainer().invoke(new Invocation(
instanceCache.createCacheKey(myId),
REMOVE_RELATION,
new Object[] { this, relatedId },
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jaws JAWSPersistenceManager.java
User: mnf999
Date: 01/12/18 21:51:24
Modified:src/main/org/jboss/ejb/plugins/jaws
JAWSPersistenceManager.java
Log:
pure init->create move
Revision ChangesPath
1.36 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/JAWSPersistenceManager.java
Index: JAWSPersistenceManager.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/JAWSPersistenceManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- JAWSPersistenceManager.java 2001/12/03 23:00:17 1.35
+++ JAWSPersistenceManager.java 2001/12/19 05:51:24 1.36
@@ -39,7 +39,7 @@
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Joe Shevland
* @author mailto:[EMAIL PROTECTED]";>Justin Forder
- * @version $Revision: 1.35 $
+ * @version $Revision: 1.36 $
*
* Revisions:
*
@@ -92,7 +92,7 @@
container = (EntityContainer)c;
}
- public void init() throws Exception
+ public void create() throws Exception
{
log.debug("Initializing JAWS plugin for " +
container.getBeanMetaData().getEjbName());
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins AbstractInstanceCache.java AbstractInstancePool.java AbstractInterceptor.java
User: mnf999
Date: 01/12/18 21:35:47
Modified:src/main/org/jboss/ejb/plugins AbstractInstanceCache.java
AbstractInstancePool.java AbstractInterceptor.java
Log:
init()->create() use of Invocation introduced
Revision ChangesPath
1.26 +3 -3 jboss/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java
Index: AbstractInstanceCache.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- AbstractInstanceCache.java2001/12/03 22:04:29 1.25
+++ AbstractInstanceCache.java2001/12/19 05:35:47 1.26
@@ -61,7 +61,7 @@
* @author Bill Burke
* @author Marc Fleury
*
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
*
* Revisions:
*
@@ -348,9 +348,9 @@
}
/* From Service interface*/
- public void init() throws Exception
+ public void create() throws Exception
{
- getCache().init();
+ getCache().create();
m_passivationHelper = new PassivationHelper();
String threadName = "Passivator Thread for " +
getContainer().getBeanMetaData().getEjbName();
1.20 +2 -2 jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java
Index: AbstractInstancePool.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractInstancePool.java 2001/11/26 03:12:25 1.19
+++ AbstractInstancePool.java 2001/12/19 05:35:47 1.20
@@ -37,7 +37,7 @@
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
* @author mailto:[EMAIL PROTECTED]";>Sacha Labourey
*
-* @version $Revision: 1.19 $
+* @version $Revision: 1.20 $
*
* Revisions:
* 20010704 marcf:
@@ -101,7 +101,7 @@
return container;
}
-public void init()
+public void create()
throws Exception
{
}
1.11 +5 -5 jboss/src/main/org/jboss/ejb/plugins/AbstractInterceptor.java
Index: AbstractInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInterceptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractInterceptor.java 2001/11/26 03:12:25 1.10
+++ AbstractInterceptor.java 2001/12/19 05:35:47 1.11
@@ -9,7 +9,7 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.Interceptor;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.logging.Logger;
/**
@@ -17,7 +17,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public abstract class AbstractInterceptor
implements Interceptor
@@ -52,7 +52,7 @@
return nextInterceptor;
}
- public void init() throws Exception {
+ public void create() throws Exception {
// empty
}
@@ -68,12 +68,12 @@
// empty
}
- public Object invokeHome(final MethodInvocation mi) throws Exception {
+ public Object invokeHome(final Invocation mi) throws Exception {
// assert mi != null;
return getNext().invokeHome(mi);
}
- public Object invoke(final MethodInvocation mi) throws Exception {
+ public Object invoke(final Invocation mi) throws Exception {
// assert mi != null;
return getNext().invoke(mi);
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb StatefulSessionContainer.java
User: mnf999
Date: 01/12/18 21:30:04
Modified:src/main/org/jboss/ejb StatefulSessionContainer.java
Log:
use of new Invocation
Revision ChangesPath
1.39 +170 -103 jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java
Index: StatefulSessionContainer.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- StatefulSessionContainer.java 2001/11/24 20:43:22 1.38
+++ StatefulSessionContainer.java 2001/12/19 05:30:04 1.39
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.ejb;
import java.lang.reflect.Method;
@@ -22,21 +22,28 @@
import javax.ejb.RemoveException;
import javax.ejb.EJBException;
+import org.jboss.invocation.Invocation;
+import org.jboss.invocation.MarshalledInvocation;
+
/**
- * The container for stateful session beans.
- *
- * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
- * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @version $Revision: 1.38 $
- *
- * Revisions
- * 20010704
- *
- * Throw an exception when removing a bean in transaction (in remove)?
- * (I dissagree) (marcf: who is the person writing this comment? please sign)
- *
- */
+* The container for stateful session beans.
+*
+* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
+* @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
+* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+* @version $Revision: 1.39 $
+*
+* Revisions
+* 20010704
+*
+* Throw an exception when removing a bean in transaction (in remove)?
+* (I dissagree) (marcf: who is the person writing this comment? please sign)
+*
+* 20011219 marc fleury
+*
+* moved to new invocation layer and Invocation usage
+*
+*/
public class StatefulSessionContainer
extends Container
implements ContainerInvokerContainer, InstancePoolContainer
@@ -45,31 +52,25 @@
// Attributes
- /** This is the Home interface class */
- protected Class homeInterface;
-
- /** This is the Remote interface class */
- protected Class remoteInterface;
-
/**
-* These are the mappings between the home interface methods and the
-* container methods.
-*/
+ * These are the mappings between the home interface methods and the
+ * container methods.
+ */
protected Map homeMapping;
/**
-* These are the mappings between the remote interface methods and the
-* bean methods.
-*/
+ * These are the mappings between the remote interface methods and the
+ * bean methods.
+ */
protected Map beanMapping;
/** This is the container invoker for this container */
protected ContainerInvoker containerInvoker;
/**
-* This is the first interceptor in the chain. The last interceptor must
-* be provided by the container itself.
-*/
+ * This is the first interceptor in the chain. The last interceptor must
+ * be provided by the container itself.
+ */
protected Interceptor interceptor;
/** This is the instancepool that is to be used */
@@ -177,7 +178,7 @@
// Container implementation --
- public void init() throws Exception
+ public void create() throws Exception
{
// Associate thread with classloader
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
@@ -190,7 +191,7 @@
remoteInterface = classLoader.loadClass(metaData.getRemote());
// Call default init
- super.init();
+ super.create();
// Map the bean methods
setupBeanMapping();
@@ -198,25 +199,28 @@
// Map the home methods
setupHomeMapping();
+ // Map the interfaces to Long
+ setupMarshalledInvocationMapping();
+
// Init container invoker
if (containerInvoker != null)
- containerInvoker.init();
+ containerInvoker.create();
// Init instance cache
- instanceCache.init();
+ instanceCache.create();
// Initialize pool
- instancePool.init();
+ instancePool.create();
// Init persistence
- persistenceManager.init();
+ persistenceManager.create();
// Initialize the interceptor by calli
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins BMPPersistenceManager.java CMPFilePersistenceManager.java CMPPersistenceManager.java
User: mnf999
Date: 01/12/18 21:37:57
Modified:src/main/org/jboss/ejb/plugins BMPPersistenceManager.java
CMPFilePersistenceManager.java
CMPPersistenceManager.java
Log:
casting on invoker and init replaced by create()
Revision ChangesPath
1.34 +4 -3 jboss/src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java
Index: BMPPersistenceManager.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- BMPPersistenceManager.java2001/12/03 23:00:16 1.33
+++ BMPPersistenceManager.java2001/12/19 05:37:57 1.34
@@ -21,6 +21,7 @@
import javax.ejb.FinderException;
import javax.ejb.RemoveException;
import javax.ejb.EJBException;
+import javax.ejb.EJBObject;
import org.jboss.ejb.Container;
import org.jboss.ejb.EntityContainer;
@@ -39,7 +40,7 @@
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
-* @version $Revision: 1.33 $
+* @version $Revision: 1.34 $
*
* Revisions:
* 20010709 andreas schaefer:
@@ -94,7 +95,7 @@
con = (EntityContainer)c;
}
- public void init()
+ public void create()
throws Exception
{
ejbLoad = EntityBean.class.getMethod("ejbLoad", new Class[0]);
@@ -252,7 +253,7 @@
// Create EJBObject
// Create EJBObject
if (con.getContainerInvoker() != null)
- ctx.setEJBObject(con.getContainerInvoker().getEntityEJBObject(cacheKey));
+ ctx.setEJBObject((EJBObject)
con.getContainerInvoker().getEntityEJBObject(cacheKey));
if (con.getLocalHomeClass() != null)
ctx.setEJBLocalObject(con.getLocalContainerInvoker().getEntityEJBLocalObject(cacheKey));
1.16 +2 -2
jboss/src/main/org/jboss/ejb/plugins/CMPFilePersistenceManager.java
Index: CMPFilePersistenceManager.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/CMPFilePersistenceManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CMPFilePersistenceManager.java2001/12/03 23:00:16 1.15
+++ CMPFilePersistenceManager.java2001/12/19 05:37:57 1.16
@@ -38,7 +38,7 @@
/**
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
* 20010801 marc fleury:
*
* - insertion in cache upon create in now done in the instance interceptor
@@ -73,7 +73,7 @@
con = (EntityContainer)c;
}
- public void init()
+ public void create()
throws Exception
{
String ejbName = con.getBeanMetaData().getEjbName();
1.38 +5 -4 jboss/src/main/org/jboss/ejb/plugins/CMPPersistenceManager.java
Index: CMPPersistenceManager.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/CMPPersistenceManager.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- CMPPersistenceManager.java2001/12/03 23:00:16 1.37
+++ CMPPersistenceManager.java2001/12/19 05:37:57 1.38
@@ -16,6 +16,7 @@
import java.util.Map;
import javax.ejb.EntityBean;
+import javax.ejb.EJBObject;
import javax.ejb.RemoveException;
import javax.ejb.EJBException;
@@ -44,7 +45,7 @@
* @author mailto:[EMAIL PROTECTED]";>Dan Christopherson
* @author mailto:[EMAIL PROTECTED]";>Bill Burke
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.38 $
*
* Revisions:
* 20010621 Bill Burke: removed loadEntities call because CMP read-ahead is now
@@ -109,7 +110,7 @@
if (con!= null) store.setContainer(con);
}
- public void init()
+ public void create()
throws Exception
{
// The common EJB methods
@@ -130,7 +131,7 @@
createMethodCache( methods );
}
- store.init();
+ store.create();
}
/**
@@ -243,7 +244,7 @@
// Create EJBObject
if (con.getContainerInvoker() != null)
{
- ctx.setEJBObject(con.getContainerInvoker().getEntityEJBObject(cacheKey));
+ ctx.setEJBObject((EJBObject)
con.getContainerInvoker().getEntityEJBObject(cacheKey));
}
if (con.getLocalHomeClass() != null)
{
___
Jboss-development mailing lis
[JBoss-dev] [AUTOMATED] JBoss compilation failed
= ==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS= = HERE ARE THE LAST 50 LINES OF THE LOG FILE symbol : method getEnterpriseContext () location: class org.jboss.invocation.Invocation return ((EntityEnterpriseContext)mi.getEnterpriseContext()).getEJBObject(); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:665: cannot resolve symbol symbol : method getId () location: class org.jboss.invocation.Invocation return (EJBObject)containerInvoker.getEntityEJBObject(((EntityCache) instanceCache).createCacheKey(mi.getId())); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:859: cannot resolve symbol symbol : variable MarshalledInvocation location: class org.jboss.ejb.EntityContainer marshalledInvocationMapping.put( new Long(MarshalledInvocation.calculateHash(m[i])), m[i]); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:864: cannot resolve symbol symbol : variable MarshalledInvocation location: class org.jboss.ejb.EntityContainer marshalledInvocationMapping.put( new Long(MarshalledInvocation.calculateHash(m[j])), m[j]); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:871: cannot resolve symbol symbol : variable MarshalledInvocation location: class org.jboss.ejb.EntityContainer marshalledInvocationMapping.put(new Long(MarshalledInvocation.calculateHash(getEJBObjectMethod)),getEJBObjectMethod); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:889: org.jboss.ejb.EntityContainer.ContainerInterceptor should be declared abstract; it does not define init() in org.jboss.ejb.EntityContainer.ContainerInterceptor class ContainerInterceptor ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:952: cannot resolve symbol symbol : method getEnterpriseContext () location: class org.jboss.invocation.Invocation return m.invoke(((EnterpriseContext) mi.getEnterpriseContext()).getInstance(), mi.getArguments()); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:1007: cannot resolve symbol symbol : method getEnterpriseContext () location: class org.jboss.invocation.Invocation return m.invoke(((EnterpriseContext) mi.getEnterpriseContext()).getInstance(), mi.getArguments()); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java:353: cannot resolve symbol symbol : method create () location: interface org.jboss.util.CachePolicy getCache().create(); ^ 100 errors 4 warnings BUILD FAILED /disk/orig/home/lubega/jbossro/jboss-all/server/build.xml:378: Compile failed, messages should have been provided. Total time: 57 seconds ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins TxInterceptorCMT.java
User: mnf999
Date: 01/12/18 21:46:26
Modified:src/main/org/jboss/ejb/plugins TxInterceptorCMT.java
Log:
init->create and Invocation
Revision ChangesPath
1.21 +9 -9 jboss/src/main/org/jboss/ejb/plugins/TxInterceptorCMT.java
Index: TxInterceptorCMT.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/TxInterceptorCMT.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TxInterceptorCMT.java 2001/12/18 20:16:40 1.20
+++ TxInterceptorCMT.java 2001/12/19 05:46:26 1.21
@@ -15,7 +15,7 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionRequiredException;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
// TODO this needs to be replaced with the log4j logging
@@ -30,7 +30,7 @@
* @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
* @author mailto:[EMAIL PROTECTED]";>Anatoly Akkerman
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class TxInterceptorCMT
extends AbstractTxInterceptor
@@ -49,7 +49,7 @@
// Interceptor implementation --
-public Object invokeHome(MethodInvocation mi)
+public Object invokeHome(Invocation mi)
throws Exception
{
return runWithTransactions(false, mi);
@@ -58,7 +58,7 @@
/**
* This method does invocation interpositioning of tx management
*/
-public Object invoke(MethodInvocation mi)
+public Object invoke(Invocation mi)
throws Exception
{
return runWithTransactions(true, mi);
@@ -98,19 +98,19 @@
*
* This is where the meat is. We define what to do with the Tx based
* on the declaration.
- * The MethodInvocation is always the final authority on what the Tx
+ * The Invocation is always the final authority on what the Tx
* looks like leaving this interceptor. In other words, interceptors
* down the chain should not rely on the thread association with Tx but
- * on the Tx present in the MethodInvocation.
+ * on the Tx present in the Invocation.
*
* @param remoteInvocation If true this is an invocation
* of a method in the remote interface, otherwise
* it is an invocation of a method in the home
* interface.
- * @param mi The MethodInvocation of this call.
+ * @param mi The Invocation of this call.
*/
private Object runWithTransactions(boolean remoteInvocation,
- MethodInvocation mi)
+ Invocation mi)
throws Exception
{
// Old transaction is the transaction that comes with the MI
@@ -173,7 +173,7 @@
//DEBUG log.debug("TxInterceptorCMT:after commit of " +
newTransaction);
}
-// reassociate the oldTransaction with the methodInvocation
(even null)
+// reassociate the oldTransaction with the Invocation (even
null)
mi.setTransaction(oldTransaction);
}
// Always drop thread association even if committing or
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins TxInterceptorBMT.java
User: mnf999
Date: 01/12/18 21:45:54
Modified:src/main/org/jboss/ejb/plugins TxInterceptorBMT.java
Log:
Revision ChangesPath
1.21 +6 -6 jboss/src/main/org/jboss/ejb/plugins/TxInterceptorBMT.java
Index: TxInterceptorBMT.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/TxInterceptorBMT.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TxInterceptorBMT.java 2001/08/03 17:15:44 1.20
+++ TxInterceptorBMT.java 2001/12/19 05:45:54 1.21
@@ -8,7 +8,7 @@
import java.util.Map;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.metadata.SessionMetaData;
@@ -20,7 +20,7 @@
* @author mailto:[EMAIL PROTECTED]";>Peter Antman.
* @author mailto:[EMAIL PROTECTED]";>Anatoly Akkerman
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class TxInterceptorBMT
extends AbstractTxInterceptorBMT
@@ -36,17 +36,17 @@
// Interceptor implementation --
- public void init()
+ public void create()
throws Exception
{
// Do initialization in superclass.
- super.init();
+ super.create();
// Set the atateless attribute
stateless = ((SessionMetaData)container.getBeanMetaData()).isStateless();
}
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
if (stateless)
@@ -56,7 +56,7 @@
return invokeNext(false, mi);
}
- public Object invoke(MethodInvocation mi)
+ public Object invoke(Invocation mi)
throws Exception
{
return invokeNext(true, mi);
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins SingletonStatelessSessionInstancePool.java StatefulSessionFilePersistenceManager.java StatefulSessionInstanceInterceptor.java StatelessSessionInstancePool.java
User: mnf999
Date: 01/12/18 21:45:37
Modified:src/main/org/jboss/ejb/plugins
SingletonStatelessSessionInstancePool.java
StatefulSessionFilePersistenceManager.java
StatefulSessionInstanceInterceptor.java
StatelessSessionInstancePool.java
Log:
init-> create Invocation and casting
Revision ChangesPath
1.15 +2 -2
jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java
Index: SingletonStatelessSessionInstancePool.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SingletonStatelessSessionInstancePool.java2001/11/26 03:12:25 1.14
+++ SingletonStatelessSessionInstancePool.java2001/12/19 05:45:37 1.15
@@ -29,7 +29,7 @@
*
* @see
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*
* Revisions:
* 20010718 andreas schaefer:
@@ -73,7 +73,7 @@
this.con = c;
}
- public void init()
+ public void create()
throws Exception
{
}
1.27 +4 -3
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionFilePersistenceManager.java
Index: StatefulSessionFilePersistenceManager.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionFilePersistenceManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StatefulSessionFilePersistenceManager.java2001/11/26 03:12:25 1.26
+++ StatefulSessionFilePersistenceManager.java2001/12/19 05:45:37 1.27
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import javax.ejb.Handle;
+import javax.ejb.EJBObject;
import javax.ejb.SessionBean;
import javax.ejb.RemoveException;
import javax.ejb.EJBException;
@@ -44,7 +45,7 @@
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
-* @version $Revision: 1.26 $
+* @version $Revision: 1.27 $
*/
public class StatefulSessionFilePersistenceManager
implements StatefulSessionPersistenceManager
@@ -74,7 +75,7 @@
con = (StatefulSessionContainer)c;
}
-public void init()
+public void create()
throws Exception
{
@@ -192,7 +193,7 @@
// Create EJBObject
if (con.getContainerInvoker() != null)
-
ctx.setEJBObject(con.getContainerInvoker().getStatefulSessionEJBObject(ctx.getId()));
+
ctx.setEJBObject((EJBObject)con.getContainerInvoker().getStatefulSessionEJBObject(ctx.getId()));
// Create EJBLocalObject
if (con.getLocalHomeClass() != null)
ctx.setEJBLocalObject(con.getLocalContainerInvoker().getStatefulSessionEJBLocalObject(ctx.getId()));
1.24 +6 -6
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
Index: StatefulSessionInstanceInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StatefulSessionInstanceInterceptor.java 2001/11/24 20:43:23 1.23
+++ StatefulSessionInstanceInterceptor.java 2001/12/19 05:45:37 1.24
@@ -26,7 +26,7 @@
import org.jboss.ejb.InstancePool;
import org.jboss.ejb.StatefulSessionContainer;
import org.jboss.ejb.EnterpriseContext;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.metadata.SessionMetaData;
/**
@@ -35,7 +35,7 @@
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Bill Burke
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
*
* Revisions:
* 20010704 marcf
@@ -100,7 +100,7 @@
// Interceptor implementation ---
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
// Get context
@@ -109,7 +109,7 @@
EnterpriseContext ctx = container.getInstancePool().get();
- // set the context on the methodInvocation
+ // set the context on the Invocation
mi.setEnterpriseContext(ctx);
// It is a new context
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins MessageDrivenInstancePool.java MessageDrivenTxInterceptorBMT.java MetricsInterceptor.java NoPassivationCachePolicy.java SecurityInterceptor.java SecurityProxyInterceptor.java
User: mnf999
Date: 01/12/18 21:42:31
Modified:src/main/org/jboss/ejb/plugins
MessageDrivenInstancePool.java
MessageDrivenTxInterceptorBMT.java
MetricsInterceptor.java
NoPassivationCachePolicy.java
SecurityInterceptor.java
SecurityProxyInterceptor.java
Log:
init()->create() and use of Invocation
Revision ChangesPath
1.9 +3 -3
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java
Index: MessageDrivenInstancePool.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MessageDrivenInstancePool.java2001/11/24 20:43:22 1.8
+++ MessageDrivenInstancePool.java2001/12/19 05:42:31 1.9
@@ -18,7 +18,7 @@
* @author mailto:[EMAIL PROTECTED]";>Peter Antman.
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
* @author mailto:[EMAIL PROTECTED]";>Sacha Labourey
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*
* Revisions:
* 20010718 andreas schaefer:
@@ -44,10 +44,10 @@
// Public
// Z implementation --
- public void init()
+ public void create()
throws Exception
{
- super.init();
+ super.create();
// for MDB, we *do* pool
this.reclaim = true;
}
1.10 +4 -4
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenTxInterceptorBMT.java
Index: MessageDrivenTxInterceptorBMT.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenTxInterceptorBMT.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MessageDrivenTxInterceptorBMT.java2001/09/01 19:50:30 1.9
+++ MessageDrivenTxInterceptorBMT.java2001/12/19 05:42:31 1.10
@@ -9,7 +9,7 @@
import java.util.Map;
import java.rmi.ServerException;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
/**
@@ -19,18 +19,18 @@
* @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
* @author mailto:[EMAIL PROTECTED]";>Peter Antman.
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class MessageDrivenTxInterceptorBMT
extends AbstractTxInterceptorBMT
{
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
throw new ServerException("No home methods for message beans.");
}
- public Object invoke(MethodInvocation mi)
+ public Object invoke(Invocation mi)
throws Exception
{
return invokeNext(true, mi);
1.13 +6 -6 jboss/src/main/org/jboss/ejb/plugins/MetricsInterceptor.java
Index: MetricsInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MetricsInterceptor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MetricsInterceptor.java 2001/11/24 20:43:22 1.12
+++ MetricsInterceptor.java 2001/12/19 05:42:31 1.13
@@ -30,7 +30,7 @@
// jboss imports
import org.jboss.ejb.Container;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.monitor.MetricsConstants;
/**
@@ -90,7 +90,7 @@
}
// Interceptor implementation
-public Object invokeHome(MethodInvocation mi) throws Exception {
+public Object invokeHome(Invocation mi) throws Exception {
long begin = System.currentTimeMillis();
@@ -102,7 +102,7 @@
}
}
-public Object invoke(MethodInvocation mi) throws Exception {
+public Object invoke(Invocation mi) throws Exception {
long begin = System.currentTimeMillis();
@@ -117,10 +117,10 @@
/**
* Starts the JMS publisher thread.
*/
- public void init() {
+ public void create() {
/*
- * looks like init() is called after setContainer().
+ * looks like create() is called after setContainer().
* wonder if container method callback order is documented somewhere, it
should be..
*/
@@ -146,7 +146,7 @@
* @param begin invocation begin time in ms
* @param end invocation end
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins EntitySynchronizationInterceptor.java LogInterceptor.java MessageDrivenInstanceInterceptor.java
User: mnf999
Date: 01/12/18 21:40:51
Modified:src/main/org/jboss/ejb/plugins
EntitySynchronizationInterceptor.java
LogInterceptor.java
MessageDrivenInstanceInterceptor.java
Log:
init()->create() method invocation -> invocation
Revision ChangesPath
1.57 +5 -5
jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java
Index: EntitySynchronizationInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- EntitySynchronizationInterceptor.java 2001/11/24 20:43:22 1.56
+++ EntitySynchronizationInterceptor.java 2001/12/19 05:40:51 1.57
@@ -24,7 +24,7 @@
import org.jboss.ejb.EntityEnterpriseContext;
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.InstanceCache;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.metadata.ConfigurationMetaData;
/**
@@ -43,7 +43,7 @@
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Scott Stark
* @author mailto:[EMAIL PROTECTED]";>Bill Burke
- * @version $Revision: 1.56 $
+ * @version $Revision: 1.57 $
*
* Revisions:
* 2001/06/28: marcf
@@ -132,7 +132,7 @@
this.container = (EntityContainer)container;
}
- public void init()
+ public void create()
throws Exception
{
@@ -211,7 +211,7 @@
// Interceptor implementation --
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
@@ -245,7 +245,7 @@
return rtn;
}
- public Object invoke(MethodInvocation mi)
+ public Object invoke(Invocation mi)
throws Exception
{
// We are going to work with the context a lot
1.21 +5 -5 jboss/src/main/org/jboss/ejb/plugins/LogInterceptor.java
Index: LogInterceptor.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/LogInterceptor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LogInterceptor.java 2001/09/11 18:34:59 1.20
+++ LogInterceptor.java 2001/12/19 05:40:51 1.21
@@ -31,7 +31,7 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.Interceptor;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.metadata.BeanMetaData;
/** An interceptor used to log call invocations. It also handles any
@@ -39,7 +39,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Scott Stark
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class LogInterceptor
extends AbstractInterceptor
@@ -65,7 +65,7 @@
}
// Container implementation --
- public void init()
+ public void create()
throws Exception
{
super.start();
@@ -76,7 +76,7 @@
callLogging = md.getContainerConfiguration().getCallLogging();
}
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
NDC.push(ejbName);
@@ -132,7 +132,7 @@
* @return
* @exception Exception
*/
- public Object invoke(MethodInvocation mi)
+ public Object invoke(Invocation mi)
throws Exception
{
NDC.push(ejbName);
1.9 +7 -6
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
Index: MessageDrivenInstanceInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MessageDrivenInstanceInterceptor.java 2001/08/03 17:15:44 1.8
+++ MessageDrivenInstanceInterceptor.java 2001/12/19 05:40:51 1.9
@@ -11,7 +11,8 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.MessageDrivenContainer;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
+import org.jboss.ejb.EnterpriseContext;
/**
* This container acquires the given instance. This must be used after
@@ -21,7 +22,7 @@
* @author mailto:[EMAIL PROTECTED]";>Peter Antman.
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailt
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb EntityContainer.java
User: mnf999
Date: 01/12/18 21:17:07
Modified:src/main/org/jboss/ejb EntityContainer.java
Log:
moved to detached invokers, MBean dynamic invocation and use of "invocation"
throughout the chain
Revision ChangesPath
1.60 +362 -327 jboss/src/main/org/jboss/ejb/EntityContainer.java
Index: EntityContainer.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EntityContainer.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- EntityContainer.java 2001/12/03 23:00:16 1.59
+++ EntityContainer.java 2001/12/19 05:17:07 1.60
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.ejb;
import java.lang.reflect.Method;
@@ -26,108 +26,111 @@
import javax.transaction.Transaction;
import org.jboss.deployment.DeploymentException;
+import org.jboss.invocation.Invocation;
+import org.jboss.invocation.MarshalledInvocation;
import org.jboss.monitor.StatisticsProvider;
import org.jboss.util.SerializableEnumeration;
+import org.jboss.system.Registry;
/**
- * This is a Container for EntityBeans (both BMP and CMP).
- *
- * @see Container
- * @see EntityEnterpriseContext
- *
- * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
- * @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
- * @author Bill Burke
- * @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
- * @version $Revision: 1.59 $
- *
- * Revisions:
- *
- * 20010701 marc fleury:
- *
- * Transaction to context wiring was moved to the instance interceptor
- *
- * 20010718 andreas schaefer:
- *
- * - Added statistics gathering
- *
- * 20010807 bill burke:
- *
- * Moved storeEntity from EntitySynchronization to here so other classes can
use it.
- * Moved synchronizeEntitiesWithinTransaction to here from Application as a
static method.
- *
- */
+* This is a Container for EntityBeans (both BMP and CMP).
+*
+* @see Container
+* @see EntityEnterpriseContext
+*
+* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
+* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+* @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
+* @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
+* @author Bill Burke
+* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer
+* @version $Revision: 1.60 $
+*
+* Revisions:
+*
+* 20010701 marc fleury:
+*
+* Transaction to context wiring was moved to the instance interceptor
+*
+* 20010718 andreas schaefer:
+*
+* - Added statistics gathering
+*
+* 20010807 bill burke:
+*
+* Moved storeEntity from EntitySynchronization to here so other classes can
use it.
+* Moved synchronizeEntitiesWithinTransaction to here from Application as a
static method.
+*
+
+* 20011219 marc fleury:
+*
+* Moved to new invoker scheme, using Invocation and MBean invokers.
+*
+*/
public class EntityContainer
- extends Container
- implements ContainerInvokerContainer, InstancePoolContainer, StatisticsProvider
+extends Container
+implements ContainerInvokerContainer, InstancePoolContainer, StatisticsProvider
{
// Constants -
-
+
// Attributes
-
- /** This is the Home interface class. */
- protected Class homeInterface;
-
- /** This is the Remote interface class. */
- protected Class remoteInterface;
-
+
/**
-* These are the mappings between the home interface methods and the
-* container methods.
-*/
+ * These are the mappings between the home interface methods and the
+ * container methods.
+ */
protected Map homeMapping;
-
+
/**
-* These are the mappings between the remote interface methods and the
-* bean methods.
-*/
+ * These are the mappings between the remote interface methods and the
+ * bean methods.
+ */
protected Map beanMapping;
-
+
+
/** This is the container invoker for this container */
protected ContainerInvoker containerInvoker;
-
+
/** This is the persistence manager for this container */
protected EntityPersistenceManager persistenceManager;
-
+
/** This is the instance cache for this container */
protected InstanceCache instanceCache;
-
+
/** This is the instancepool that is to be used */
protected InstancePool instancePool;
-
+
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins EntityInstanceInterceptor.java EntityLockInterceptor.java EntityMultiInstanceInterceptor.java
User: mnf999
Date: 01/12/18 21:39:25
Modified:src/main/org/jboss/ejb/plugins
EntityInstanceInterceptor.java
EntityLockInterceptor.java
EntityMultiInstanceInterceptor.java
Log:
Methodinvocation -> Invocation
Revision ChangesPath
1.47 +6 -6
jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
Index: EntityInstanceInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- EntityInstanceInterceptor.java2001/11/24 20:43:22 1.46
+++ EntityInstanceInterceptor.java2001/12/19 05:39:24 1.47
@@ -16,7 +16,7 @@
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.InstanceCache;
import org.jboss.ejb.InstancePool;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.CacheKey;
/**
@@ -26,7 +26,7 @@
* This particular container interceptor implements pessimistic locking
*on the transaction that is associated with the retrieved instance. If
*there is a transaction associated with the target component and it is
-*different from the transaction associated with the MethodInvocation
+*different from the transaction associated with the Invocation
*coming in then the policy is to wait for transactional commit.
*
* We also implement serialization of calls in here (this is a spec
@@ -40,7 +40,7 @@
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Scott Stark
* @author mailto:[EMAIL PROTECTED]";>Bill Burke
-* @version $Revision: 1.46 $
+* @version $Revision: 1.47 $
*
* Revisions:
* 2001/06/28: marcf
@@ -115,7 +115,7 @@
// Interceptor implementation --
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
// Get context
@@ -154,7 +154,7 @@
return rtn;
}
- public Object invoke(MethodInvocation mi)
+ public Object invoke(Invocation mi)
throws Exception
{
@@ -215,7 +215,7 @@
}
else if (ctx.getId() == null)
{
- // The key from the MethodInvocation still identifies the right
cachekey
+ // The key from the Invocation still identifies the right cachekey
container.getInstanceCache().remove(key);
if( trace ) log.trace("Ending invoke, cache removal, ctx="+ctx);
1.8 +4 -4 jboss/src/main/org/jboss/ejb/plugins/EntityLockInterceptor.java
Index: EntityLockInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityLockInterceptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EntityLockInterceptor.java2001/11/24 20:43:22 1.7
+++ EntityLockInterceptor.java2001/12/19 05:39:24 1.8
@@ -12,7 +12,7 @@
import org.jboss.ejb.BeanLock;
import org.jboss.ejb.BeanLockManager;
import org.jboss.ejb.EntityContainer;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.CacheKey;
/**
@@ -31,7 +31,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Bill Burke
-* @version $Revision: 1.7 $
+* @version $Revision: 1.8 $
*
* Revisions:
* 2001/07/30: marcf
@@ -73,7 +73,7 @@
// Interceptor implementation --
- public Object invokeHome(MethodInvocation mi)
+ public Object invokeHome(Invocation mi)
throws Exception
{
// Invoke through interceptors
@@ -81,7 +81,7 @@
}
- public Object invoke(MethodInvocation mi)
+ public Object invoke(Invocation mi)
throws Exception
{
1.4 +4 -4
jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
Index: EntityMultiInstanceInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EntityMultiInstanceInterceptor.java 2001/11/24 20:43:22 1.3
+++ EntityMultiInstanceInterceptor.java 2001/12/19 05:39:24 1.4
@@ -14,7 +14,7 @@
import org.jboss.ejb.EntityEnterpriseContext;
import org.jboss.ejb.Enterpris
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb StatelessSessionEnterpriseContext.java
User: mnf999
Date: 01/12/18 21:34:29
Modified:src/main/org/jboss/ejb
StatelessSessionEnterpriseContext.java
Log:
Casting for the containerinvoker
Revision ChangesPath
1.14 +3 -6
jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java
Index: StatelessSessionEnterpriseContext.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StatelessSessionEnterpriseContext.java2001/08/03 17:15:43 1.13
+++ StatelessSessionEnterpriseContext.java2001/12/19 05:34:29 1.14
@@ -22,7 +22,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author Sebastien Alborini
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class StatelessSessionEnterpriseContext
extends EnterpriseContext
@@ -117,11 +117,8 @@
throw new IllegalStateException( "No remote interface defined." );
if (ejbObject == null) {
-try {
- ejbObject =
((StatelessSessionContainer)con).getContainerInvoker().getStatelessSessionEJBObject();
-} catch (RemoteException re) {
- throw new IllegalStateException();
-}
+ ejbObject = (EJBObject)
((StatelessSessionContainer)con).getContainerInvoker().getStatelessSessionEJBObject();
+
}
return ejbObject;
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb StatelessSessionContainer.java
User: mnf999
Date: 01/12/18 21:32:43
Modified:src/main/org/jboss/ejb StatelessSessionContainer.java
Log:
move to the new invocation layer
Revision ChangesPath
1.30 +217 -176 jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java
Index: StatelessSessionContainer.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StatelessSessionContainer.java2001/11/24 20:43:22 1.29
+++ StatelessSessionContainer.java2001/12/19 05:32:43 1.30
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.ejb;
import java.lang.reflect.InvocationTargetException;
@@ -23,85 +23,90 @@
import javax.ejb.RemoveException;
import javax.ejb.EJBException;
+import org.jboss.invocation.Invocation;
+import org.jboss.invocation.MarshalledInvocation;
+
/**
- * The container for stateless session beans.
- *
- * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
- * @version $Revision: 1.29 $
- */
+* The container for stateless session beans.
+*
+* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
+* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+* @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
+* @version $Revision: 1.30 $
+* 2001219 marc fleury
+*
+* move to the new invocation layer and Invocation object
+*
+*/
public class StatelessSessionContainer
- extends Container
- implements ContainerInvokerContainer, InstancePoolContainer
+extends Container
+implements ContainerInvokerContainer, InstancePoolContainer
{
// Constants -
-
+
// Attributes
-
- /** This is the Home interface class */
- protected Class homeInterface;
-
- /** This is the Remote interface class */
- protected Class remoteInterface;
-
+
/**
-* These are the mappings between the home interface methods and the
-* container methods.
-*/
+ * These are the mappings between the home interface methods and the
+ * container methods.
+ */
protected Map homeMapping;
+
/**
-* These are the mappings between the remote interface methods and the
-* bean methods.
-*/
+ * These are the mappings between the remote interface methods and the
+ * bean methods.
+ */
protected Map beanMapping;
+
/** This is the container invoker for this container */
protected ContainerInvoker containerInvoker;
+
/** This is the instancepool that is to be used */
protected InstancePool instancePool;
+
/**
-* This is the first interceptor in the chain. The last interceptor must
-* be provided by the container itself
-*/
+ * This is the first interceptor in the chain. The last interceptor must
+ * be provided by the container itself
+ */
protected Interceptor interceptor;
// Static
// Constructors --
-
+
// Public
-
+
public void setContainerInvoker(ContainerInvoker ci)
{
if (ci == null)
throw new IllegalArgumentException("Null invoker");
-
+
this.containerInvoker = ci;
ci.setContainer(this);
}
-
+
public ContainerInvoker getContainerInvoker()
{
return containerInvoker;
}
-
+
public LocalContainerInvoker getLocalContainerInvoker()
{
return localContainerInvoker;
}
-
+
public void setInstancePool(InstancePool ip)
{
if (ip == null)
throw new IllegalArgumentException("Null pool");
-
+
this.instancePool = ip;
ip.setContainer(this);
}
-
+
public InstancePool getInstancePool()
{
return instancePool;
}
-
+
public void addInterceptor(Interceptor in)
{
if (interceptor == null)
@@ -114,86 +119,89 @@
{
current = current.getNext();
}
-
+
current.setNext(in);
}
}
-
+
public Interceptor getInterceptor()
{
return interceptor;
}
-
+
public Class getHomeClass(
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins AbstractTxInterceptor.java AbstractTxInterceptorBMT.java
User: mnf999
Date: 01/12/18 21:36:53
Modified:src/main/org/jboss/ejb/plugins AbstractTxInterceptor.java
AbstractTxInterceptorBMT.java
Log:
init()->create() use of Invocation
Revision ChangesPath
1.8 +5 -5 jboss/src/main/org/jboss/ejb/plugins/AbstractTxInterceptor.java
Index: AbstractTxInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractTxInterceptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractTxInterceptor.java2001/11/26 03:12:25 1.7
+++ AbstractTxInterceptor.java2001/12/19 05:36:53 1.8
@@ -18,14 +18,14 @@
import javax.ejb.NoSuchEntityException;
import org.jboss.ejb.Container;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.logging.Logger;
/**
* A common superclass for the transaction interceptors.
*
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
abstract class AbstractTxInterceptor
extends AbstractInterceptor
@@ -62,7 +62,7 @@
// Interceptor implementation --
-public void init()
+public void create()
throws Exception
{
tm = (TransactionManager) getContainer().getTransactionManager();
@@ -83,11 +83,11 @@
* of a method in the remote interface, otherwise
* it is an invocation of a method in the home
* interface.
- * @param mi The MethodInvocation of this call.
+ * @param mi The Invocation of this call.
* @param newTx If true the transaction has just been
* started in this interceptor.
*/
-protected Object invokeNext(boolean remoteInvocation, MethodInvocation mi,
+protected Object invokeNext(boolean remoteInvocation, Invocation mi,
boolean newTx)
throws Exception
{
1.6 +7 -7
jboss/src/main/org/jboss/ejb/plugins/AbstractTxInterceptorBMT.java
Index: AbstractTxInterceptorBMT.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractTxInterceptorBMT.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTxInterceptorBMT.java 2001/11/24 20:43:22 1.5
+++ AbstractTxInterceptorBMT.java 2001/12/19 05:36:53 1.6
@@ -22,14 +22,14 @@
import javax.naming.spi.ObjectFactory;
import org.jboss.ejb.EnterpriseContext;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
/**
* A common superclass for the BMT transaction interceptors.
*
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
abstract class AbstractTxInterceptorBMT
extends AbstractTxInterceptor
@@ -60,11 +60,11 @@
// Interceptor implementation --
- public void init()
+ public void create()
throws Exception
{
// Do initialization in superclass.
- super.init();
+ super.create();
// bind java:comp/UserTransaction
RefAddr refAddr = new RefAddr("userTransaction") {
@@ -105,9 +105,9 @@
* of a method in the remote interface, otherwise
* it is an invocation of a method in the home
* interface.
-* @param mi The MethodInvocation of this call.
+* @param mi The Invocation of this call.
*/
- protected Object invokeNext(boolean remoteInvocation, MethodInvocation mi)
+ protected Object invokeNext(boolean remoteInvocation, Invocation mi)
throws Exception
{
// Save the transaction that comes with the MI
@@ -122,7 +122,7 @@
Transaction threadTx = tm.suspend();
try {
- EnterpriseContext ctx = mi.getEnterpriseContext();
+ EnterpriseContext ctx = ((EnterpriseContext) mi.getEnterpriseContext());
// Set the threadlocal to the userTransaction of the instance
userTransaction.set(ctx.getEJBContext().getUserTransaction());
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb StatefulSessionEnterpriseContext.java
User: mnf999
Date: 01/12/18 21:31:04
Modified:src/main/org/jboss/ejb StatefulSessionEnterpriseContext.java
Log:
casting for container invoker change
Revision ChangesPath
1.20 +2 -6
jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java
Index: StatefulSessionEnterpriseContext.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StatefulSessionEnterpriseContext.java 2001/11/26 03:12:24 1.19
+++ StatefulSessionEnterpriseContext.java 2001/12/19 05:31:04 1.20
@@ -26,7 +26,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
public class StatefulSessionEnterpriseContext
extends EnterpriseContext
@@ -131,11 +131,7 @@
throw new IllegalStateException( "No remote interface defined." );
if (ejbObject == null) {
-try {
- ejbObject =
((StatefulSessionContainer)con).getContainerInvoker().getStatefulSessionEJBObject(id);
-} catch (RemoteException re) {
- throw new IllegalStateException();
-}
+ ejbObject = (EJBObject)
((StatefulSessionContainer)con).getContainerInvoker().getStatefulSessionEJBObject(id);
}
return ejbObject;
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Interceptor.java
User: mnf999 Date: 01/12/18 21:24:01 Modified:src/main/org/jboss/ejb Interceptor.java Log: logs Revision ChangesPath 1.10 +7 -1 jboss/src/main/org/jboss/ejb/Interceptor.java Index: Interceptor.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Interceptor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Interceptor.java 2001/12/19 05:20:47 1.9 +++ Interceptor.java 2001/12/19 05:24:01 1.10 @@ -13,7 +13,13 @@ * Provides the interface for all container interceptors. * * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg - * @version $Revision: 1.9 $ + * @author mailto:[EMAIL PROTECTED]";>Marc Fleury + * @version $Revision: 1.10 $ + * + *20011219 marc fleury: + * + * Method Invocation is replaced by Invocation + * */ public interface Interceptor extends ContainerPlugin ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [ jboss-Patches-494915 ] disable PreparedStatement Cache
Patches item #494915, was opened at 2001-12-18 21:28
You can respond by visiting:
http://sourceforge.net/tracker/?func=detail&atid=376687&aid=494915&group_id=22866
Category: JBossServer
Group: v2.4 BETA (stable)
Status: Open
Resolution: None
Priority: 5
Submitted By: Larry Sanderson (lsanders)
Assigned to: Nobody/Anonymous (nobody)
Summary: disable PreparedStatement Cache
Initial Comment:
The org.jboss.pool.jdbc.xa.wrapper.XAClientConnection
class provides a mechanism to pool prepared
statements. Currently, there is no way to disable the
pooling, but there is a way to set the cache's maximum
size. A zero indicates no maximum.
I modified it so that if the PSCacheSize is set to
zero, that will disable the pooling. If set to any
negetive number, then the cache size has no maximum.
diff -u:
===
RCS
file: /cvsroot/jboss/jbosspool/src/main/org/jboss/pool/
jdbc/xa/wrapper/Attic/XAClientConnection.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 XAClientConnection.java
---
org/jboss/pool/jdbc/xa/wrapper/XAClientConnection.java
2001/05/15 07:58:24 1.1.1.1
+++
org/jboss/pool/jdbc/xa/wrapper/XAClientConnection.java
2001/12/19 05:21:22
@@ -71,7 +71,7 @@
*/
public void setPSCacheSize(int maxSize) {
preparedStatementCacheSize = maxSize;
-if(maxSize >= 0 && preparedStatementCache !=
null) {
+if(preparedStatementCache != null) {
preparedStatementCache.setSize(maxSize);
}
}
@@ -164,7 +164,13 @@
public PreparedStatement prepareStatement(String
sql) throws SQLException {
if(con == null) throw new SQLException
(CLOSED);
try {
-PreparedStatement ps = (PreparedStatement)
preparedStatementCache.useObject(sql);
+PreparedStatement ps;
+if (preparedStatementCacheSize == 0) {
+// cache disabled
+ps = con.prepareStatement(sql);
+} else {
+ps = (PreparedStatement)
preparedStatementCache.useObject(sql);
+}
if(ps == null)
throw new SQLException("Unable to
create PreparedStatement!");
PreparedStatementInPool wrapper = new
PreparedStatementInPool(ps, this, sql);
--
You can respond by visiting:
http://sourceforge.net/tracker/?func=detail&atid=376687&aid=494915&group_id=22866
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] Lighting factory in China--seeking business cooperation
we are attracting all kinds of leeches these days but this is frankly un-expected... marcf -Original Message-From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of [EMAIL PROTECTED]Sent: Wednesday, December 19, 2001 12:03 AMTo: [EMAIL PROTECTED]Subject: [JBoss-dev] Lighting factory in China--seeking business cooperationDear Sir How are you . We are a lighting factory in China ,It is glad to introduce ourselves to you: I am XUBIN (Jack) , XUBIN is my chinese name , you can just call me Jack !! , I am export manager of Bossile Lighting Group , China, our group have four factory (1) BOSSILE Lightin Factory( the lighting are suitable for Asia market) (2) TISSILE Energy Saving Lamp Factory(producing energy saving lamp & bulb (3)WANDFONG plastic& Electric Appliance Factory (the lighting are suitable for Russia ,Europe , Middle East and US Market) (4)XUHUI Aluminium Casting Factory( producing outdoor lighting for public place) Here is our company profile : Zhongshan Guzhen BOSSILE Lighting Group is the production base of HK BOSSILE Lighting LTD in china Mainland. It encompasses an area of 28,000M2, possess automatic assembly lines and other advanced equipments, which provide us with creative abilities in production. Our products enjoying high reputation for its unique design, perfect performance and high quality. We have our own design center with advanced equipments and high-qualified designer. Taking advantage of new technology and modern material, we are producing elegant, artistic and functional products, in our showroom of 3000M2, there are thousands of vivid samples on demonstration, which can satisfy your requirements for energy saving lamps,copper lamps, crystal lamps, ceiling lamps, pendant lamps and wall lamps. Currently, BOSSILE have established its own sales net in whole china and became a leading manufacturer in lighting industry. Quality is essential to existence and further development; we have series advanced testing facilities and a complete quality control system to guarantee our products up to the international standard. At present, our products have achieved the ISO9001/ CE/ UL /Great Wall Certification. Be supported by our clients, Zhongshan BOSSILE Lighting & Electric Appliance Factory have made rapid progresses in both domestic and overseas markets. Currently, BOSSILE products have been widely exported to Europe, America, Middle East, South Africa and South East Asia . It is endless to pursue perfect, We would like to cooperate with friends all over the world based on equality and mutual benefit and carve out a bright future. I wish it will be a good beginning of our long-term cooperation , If you consider our products are suitabe for your market ,please call or fax me as soon as possible,I will offer you our high-quality products with competitive price . I am looking forward to seeing your early reply. Best wishes, Yours sincerely Xubin (Jack) Export Department Manager Address: No.222 Xinxing Road,Fuxing Mansion,Guzhen Town,Zhongshan City , Guangdong , P.R China Tel: 0086-760- 2398773 / 3366339 (Export Departmrent) Mob: 0086-1360034(Personal & Night) Fax: 0086-760-2398778 / 3388072 (Export Departmrent) Contact: Mr. Jack (Imp&Exp Department Manager) Web: www.bossile.com www.tissile.com E-mail: [EMAIL PROTECTED](Imp&Exp Department Manager) Lighting factory form china---seeking cooperati ±¾ÓʼþÓÉËÑÒ×Ê×´´¡°ÎÞÐèSMTPȺ·¢Æ÷¡±·¢ËÍ£¬ÄÚÈÝÓë±¾¹«Ë¾Î޹ء£ËÑÒ×ϵÁÐÈí¼þ£¬×¨ÎªÍøÉÏÓªÏúÈËÊ¿Éè¼Æ£ºhttp://www.seekeasysoft.net ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb EntityEnterpriseContext.java
User: mnf999
Date: 01/12/18 21:20:04
Modified:src/main/org/jboss/ejb EntityEnterpriseContext.java
Log:
casting for the new CotnainerInvoker Object return
Revision ChangesPath
1.25 +4 -7 jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java
Index: EntityEnterpriseContext.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- EntityEnterpriseContext.java 2001/11/24 20:43:22 1.24
+++ EntityEnterpriseContext.java 2001/12/19 05:20:03 1.25
@@ -26,7 +26,7 @@
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*
* Revisions
* 20010703 marcf
@@ -183,14 +183,11 @@
throw new IllegalStateException( "No remote interface defined." );
if (ejbObject == null) {
-try {
+
// Create a new CacheKey
Object cacheKey =
((EntityCache)((EntityContainer)con).getInstanceCache()).createCacheKey(id);
- ejbObject =
((EntityContainer)con).getContainerInvoker().getEntityEJBObject(cacheKey);
-}
-catch (RemoteException re) {
- throw new IllegalStateException();
-}
+ ejbObject = (EJBObject)
((EntityContainer)con).getContainerInvoker().getEntityEJBObject(cacheKey);
+
}
return ejbObject;
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb MessageDrivenContainer.java
User: mnf999
Date: 01/12/18 21:25:25
Modified:src/main/org/jboss/ejb MessageDrivenContainer.java
Log:
create() reinstated and Invocation usage
Revision ChangesPath
1.17 +17 -14jboss/src/main/org/jboss/ejb/MessageDrivenContainer.java
Index: MessageDrivenContainer.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/MessageDrivenContainer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MessageDrivenContainer.java 2001/11/24 20:43:22 1.16
+++ MessageDrivenContainer.java 2001/12/19 05:25:25 1.17
@@ -20,6 +20,9 @@
import javax.ejb.RemoveException;
import javax.ejb.EJBException;
+import org.jboss.invocation.Invocation;
+import org.jboss.ejb.EnterpriseContext;
+
/**
* MessageDrivenContainer, based on the StatelessSessionContainer.
*
@@ -31,7 +34,7 @@
* @author mailto:[EMAIL PROTECTED]";>Daniel OConnor
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
* @author mailto:[EMAIL PROTECTED]";>Scott Stark
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public class MessageDrivenContainer
extends Container
@@ -144,7 +147,7 @@
// Container implementation - overridden here --
-public void init() throws Exception
+public void create() throws Exception
{
try {
// Associate thread with classloader
@@ -152,22 +155,22 @@
Thread.currentThread().setContextClassLoader(getClassLoader());
// Call default init
-super.init();
+super.create();
// Map the bean methods
setupBeanMapping();
// Initialize pool
-instancePool.init();
+instancePool.create();
// Init container invoker
-containerInvoker.init();
+containerInvoker.create();
// Initialize the interceptor by calling the chain
Interceptor in = interceptor;
while (in != null) {
in.setContainer(this);
-in.init();
+in.create();
in = in.getNext();
}
@@ -262,7 +265,7 @@
}
-public Object invokeHome(MethodInvocation mi)
+public Object invokeHome(Invocation mi)
throws Exception
{
throw new Error("invokeHome not valid for MessageDriven beans");
@@ -274,7 +277,7 @@
* retrieves the instance from an object table, and invokes the method
* on the particular instance
*/
-public Object invoke(MethodInvocation mi)
+public Object invoke(Invocation mi)
throws Exception
{
// Invoke through interceptors
@@ -370,12 +373,12 @@
public void setNext(Interceptor interceptor) {}
public Interceptor getNext() { return null; }
-public void init() {}
+public void create() {}
public void start() {}
public void stop() {}
public void destroy() {}
-public Object invokeHome(MethodInvocation mi)
+public Object invokeHome(Invocation mi)
throws Exception
{
throw new Error("invokeHome not valid for MessageDriven beans");
@@ -386,13 +389,13 @@
* beans with bean managed transaction?? Probably best done in the
* listener "proxys"
*/
-public Object invoke(MethodInvocation mi)
+public Object invoke(Invocation mi)
throws Exception
{
// wire the transaction on the context,
// this is how the instance remember the tx
-if (mi.getEnterpriseContext().getTransaction() == null) {
-mi.getEnterpriseContext().setTransaction(mi.getTransaction());
+if (((EnterpriseContext) mi.getEnterpriseContext()).getTransaction() ==
null) {
+((EnterpriseContext)
mi.getEnterpriseContext()).setTransaction(mi.getTransaction());
}
// Get method and instance to invoke upon
@@ -403,7 +406,7 @@
{
// Invoke and handle exceptions
try {
-return m.invoke(mi.getEnterpriseContext().getInstance(),
+return m.invoke(((EnterpriseContext)
mi.getEnterpriseContext()).getInstance(),
mi.getArguments());
}
catch (IllegalAccessException e) {
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Interceptor.java
User: mnf999 Date: 01/12/18 21:20:47 Modified:src/main/org/jboss/ejb Interceptor.java Log: Interceptors now work with the generalized "Invocation", that is the whole point... Revision ChangesPath 1.9 +5 -3 jboss/src/main/org/jboss/ejb/Interceptor.java Index: Interceptor.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Interceptor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Interceptor.java 2001/11/24 20:43:22 1.8 +++ Interceptor.java 2001/12/19 05:20:47 1.9 @@ -6,12 +6,14 @@ */ package org.jboss.ejb; +import org.jboss.invocation.Invocation; + /** * Provides the interface for all container interceptors. * * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public interface Interceptor extends ContainerPlugin @@ -38,7 +40,7 @@ * * @throws Exception ??? */ - Object invokeHome(MethodInvocation mi) throws Exception; + Object invokeHome(Invocation mi) throws Exception; /** * ??? @@ -48,6 +50,6 @@ * * @throws Exception ??? */ - Object invoke(MethodInvocation mi) throws Exception; + Object invoke(Invocation mi) throws Exception; } ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb ContainerInvoker.java
User: mnf999
Date: 01/12/18 21:12:42
Modified:src/main/org/jboss/ejb ContainerInvoker.java
Log:
move to Object return to allow flexible implementations and removed the exception
throwing
Revision ChangesPath
1.10 +14 -7 jboss/src/main/org/jboss/ejb/ContainerInvoker.java
Index: ContainerInvoker.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerInvoker.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContainerInvoker.java 2001/08/03 17:15:43 1.9
+++ ContainerInvoker.java 2001/12/19 05:12:42 1.10
@@ -30,10 +30,17 @@
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
+ *
+ *20011219 marc fleury:
+*
+* Moved from typed return to Object to allow for optimizations in creation
+* Per Dain Sundstrom requests removed the Remote Exception.
+* The Container Invoker is going to be replaced by the ProxyFactory
+*
*/
public interface ContainerInvoker
- extends ContainerPlugin
+extends ContainerPlugin
{
/**
* This method is called whenever the metadata for this container is
@@ -49,7 +56,7 @@
*
* @returnAn implementation of the home interface for this container.
*/
- EJBHome getEJBHome();
+ Object getEJBHome();
/**
* This method is called whenever an EJBObject implementation for a
@@ -59,7 +66,7 @@
*
* @throws RemoteExceptionThrown if the EJBObject could not be created.
*/
- EJBObject getStatelessSessionEJBObject() throws RemoteException;
+ Object getStatelessSessionEJBObject();
/**
* This method is called whenever an EJBObject implementation for a stateful
@@ -71,7 +78,7 @@
*
* @throws RemoteExceptionThrown if the EJBObject could not be created.
*/
- EJBObject getStatefulSessionEJBObject(Object id) throws RemoteException;
+ Object getStatefulSessionEJBObject(Object id);
/**
* This method is called whenever an EJBObject implementation for an
@@ -83,7 +90,7 @@
*
* @throws RemoteExceptionThrown if the EJBObject could not be created.
*/
- EJBObject getEntityEJBObject(Object id) throws RemoteException;
+ Object getEntityEJBObject(Object id);
/**
* This method is called whenever a collection of EJBObjects for a
@@ -95,6 +102,6 @@
*
* @throws RemoteExceptionThrown if the EJBObjects could not be created.
*/
- Collection getEntityCollection(Collection enum) throws RemoteException;
+ Collection getEntityCollection(Collection enum);
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb EnterpriseContext.java
User: mnf999
Date: 01/12/18 21:13:37
Modified:src/main/org/jboss/ejb EnterpriseContext.java
Log:
adapt the returns of container invoker, need to cast now that we moved to object
Revision ChangesPath
1.41 +4 -4 jboss/src/main/org/jboss/ejb/EnterpriseContext.java
Index: EnterpriseContext.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- EnterpriseContext.java2001/11/26 03:12:24 1.40
+++ EnterpriseContext.java2001/12/19 05:13:37 1.41
@@ -47,7 +47,7 @@
* @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
* @author mailto:[EMAIL PROTECTED]";>Juha Lindfors
* @author mailto:[EMAIL PROTECTED]";>Ole Husgaard
- * @version $Revision: 1.40 $
+ * @version $Revision: 1.41 $
*
* Revisions:
* 2001/06/29: marcf
@@ -254,19 +254,19 @@
{
if (((EntityContainer)con).getContainerInvoker()==null)
throw new IllegalStateException( "No remote home defined." );
-return ((EntityContainer)con).getContainerInvoker().getEJBHome();
+return
(EJBHome)((EntityContainer)con).getContainerInvoker().getEJBHome();
}
else if (con instanceof StatelessSessionContainer)
{
if (((StatelessSessionContainer)con).getContainerInvoker()==null)
throw new IllegalStateException( "No remote home defined." );
-return
((StatelessSessionContainer)con).getContainerInvoker().getEJBHome();
+return (EJBHome)
((StatelessSessionContainer)con).getContainerInvoker().getEJBHome();
}
else if (con instanceof StatefulSessionContainer)
{
if (((StatefulSessionContainer)con).getContainerInvoker()==null)
throw new IllegalStateException( "No remote home defined." );
-return
((StatefulSessionContainer)con).getContainerInvoker().getEJBHome();
+return (EJBHome)
((StatefulSessionContainer)con).getContainerInvoker().getEJBHome();
}
// Should never get here
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] Lighting factory in China--seeking business cooperation
Dear Sir How are you . We are a lighting factory in China ,It is glad to introduce ourselves to you: I am XUBIN (Jack) , XUBIN is my chinese name , you can just call me Jack !! , I am export manager of Bossile Lighting Group , China, our group have four factory (1) BOSSILE Lightin Factory( the lighting are suitable for Asia market) (2) TISSILE Energy Saving Lamp Factory(producing energy saving lamp & bulb (3)WANDFONG plastic& Electric Appliance Factory (the lighting are suitable for Russia ,Europe , Middle East and US Market) (4)XUHUI Aluminium Casting Factory( producing outdoor lighting for public place) Here is our company profile : Zhongshan Guzhen BOSSILE Lighting Group is the production base of HK BOSSILE Lighting LTD in china Mainland. It encompasses an area of 28,000M2, possess automatic assembly lines and other advanced equipments, which provide us with creative abilities in production. Our products enjoying high reputation for its unique design, perfect performance and high quality. We have our own design center with advanced equipments and high-qualified designer. Taking advantage of new technology and modern material, we are producing elegant, artistic and functional products, in our showroom of 3000M2, there are thousands of vivid samples on demonstration, which can satisfy your requirements for energy saving lamps,copper lamps, crystal lamps, ceiling lamps, pendant lamps and wall lamps. Currently, BOSSILE have established its own sales net in whole china and became a leading manufacturer in lighting industry. Quality is essential to existence and further development; we have series advanced testing facilities and a complete quality control system to guarantee our products up to the international standard. At present, our products have achieved the ISO9001/ CE/ UL /Great Wall Certification. Be supported by our clients, Zhongshan BOSSILE Lighting & Electric Appliance Factory have made rapid progresses in both domestic and overseas markets. Currently, BOSSILE products have been widely exported to Europe, America, Middle East, South Africa and South East Asia . It is endless to pursue perfect, We would like to cooperate with friends all over the world based on equality and mutual benefit and carve out a bright future. I wish it will be a good beginning of our long-term cooperation , If you consider our products are suitabe for your market ,please call or fax me as soon as possible,I will offer you our high-quality products with competitive price . I am looking forward to seeing your early reply. Best wishes, Yours sincerely Xubin (Jack) Export Department Manager Address: No.222 Xinxing Road,Fuxing Mansion,Guzhen Town,Zhongshan City , Guangdong , P.R China Tel: 0086-760- 2398773 / 3366339 (Export Departmrent) Mob: 0086-1360034(Personal & Night) Fax: 0086-760-2398778 / 3388072 (Export Departmrent) Contact: Mr. Jack (Imp&Exp Department Manager) Web: www.bossile.com www.tissile.com E-mail: [EMAIL PROTECTED](Imp&Exp Department Manager) Lighting factory form china---seeking cooperati ±¾ÓʼþÓÉËÑÒ×Ê×´´¡°ÎÞÐèSMTPȺ·¢Æ÷¡±·¢ËÍ£¬ÄÚÈÝÓë±¾¹«Ë¾Î޹ء£ ËÑÒ×ϵÁÐÈí¼þ£¬×¨ÎªÍøÉÏÓªÏúÈËÊ¿Éè¼Æ£ºhttp://www.seekeasysoft.net ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [AUTOMATED] JBoss compilation failed
= ==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS= = HERE ARE THE LAST 50 LINES OF THE LOG FILE ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:340: warning: java.security.Identity in java.security has been deprecated public boolean isCallerInRole(Identity id) ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/MessageDrivenContainer.java:36: org.jboss.ejb.MessageDrivenContainer should be declared abstract; it does not define invoke(org.jboss.invocation.Invocation) in org.jboss.ejb.Container public class MessageDrivenContainer ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/MessageDrivenContainer.java:155: cannot resolve symbol symbol : method init () location: class org.jboss.ejb.Container super.init(); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/StatelessSessionContainer.java:34: org.jboss.ejb.StatelessSessionContainer should be declared abstract; it does not define invoke(org.jboss.invocation.Invocation) in org.jboss.ejb.Container public class StatelessSessionContainer ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/StatelessSessionContainer.java:153: cannot resolve symbol symbol : method init () location: class org.jboss.ejb.Container super.init(); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/StatefulSessionContainer.java:40: org.jboss.ejb.StatefulSessionContainer should be declared abstract; it does not define invoke(org.jboss.invocation.Invocation) in org.jboss.ejb.Container public class StatefulSessionContainer ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/StatefulSessionContainer.java:193: cannot resolve symbol symbol : method init () location: class org.jboss.ejb.Container super.init(); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:62: org.jboss.ejb.EntityContainer should be declared abstract; it does not define invoke(org.jboss.invocation.Invocation) in org.jboss.ejb.Container public class EntityContainer ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EntityContainer.java:284: cannot resolve symbol symbol : method init () location: class org.jboss.ejb.Container super.init(); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java:47: org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock should be declared abstract; it does not define schedule(org.jboss.invocation.Invocation) in org.jboss.ejb.plugins.lock.BeanLockSupport public class QueuedPessimisticEJBLock extends BeanLockSupport ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/plugins/lock/SimplePessimisticEJBLock.java:52: org.jboss.ejb.plugins.lock.SimplePessimisticEJBLock should be declared abstract; it does not define schedule(org.jboss.invocation.Invocation) in org.jboss.ejb.plugins.lock.BeanLockSupport public class SimplePessimisticEJBLock ^ 47 errors 4 warnings BUILD FAILED /disk/orig/home/lubega/jbossro/jboss-all/server/build.xml:378: Compile failed, messages should have been provided. Total time: 1 minute 3 seconds ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb ContainerFactory.java
User: mnf999
Date: 01/12/18 20:55:01
Modified:src/main/org/jboss/ejb ContainerFactory.java
Log:
support for new proxyfactory and deprecate container invoker
Revision ChangesPath
1.106 +310 -296 jboss/src/main/org/jboss/ejb/ContainerFactory.java
Index: ContainerFactory.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ContainerFactory.java 2001/12/09 07:35:15 1.105
+++ ContainerFactory.java 2001/12/19 04:55:00 1.106
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.ejb;
import java.net.MalformedURLException;
@@ -55,9 +55,9 @@
import org.jboss.management.j2ee.EjbModule;
/**
- * A ContainerFactory is used to deploy EJB applications. It can be given a
- * URL to an EJB-jar or EJB-JAR XML file, which will be used to instantiate
- * containers and make them available for invocation.
+* A ContainerFactory is used to deploy EJB applications. It can be given a
+* URL to an EJB-jar or EJB-JAR XML file, which will be used to instantiate
+* containers and make them available for invocation.
*
* Now also works with message driven beans.
*
@@ -70,311 +70,312 @@
* @author mailto:[EMAIL PROTECTED]";>Peter Antman.
* @author mailto:[EMAIL PROTECTED]";>Scott Stark
* @author mailto:[EMAIL PROTECTED]";>Sacha Labourey
-* @version $Revision: 1.105 $
+* @version $Revision: 1.106 $
*/
public class ContainerFactory
- extends ServiceMBeanSupport
- implements ContainerFactoryMBean
+extends ServiceMBeanSupport
+implements ContainerFactoryMBean
{
// Constants -
private static final String SERVICE_CONTROLLER_NAME =
"JBOSS-SYSTEM:spine=ServiceController";
-
+
public static String DEFAULT_STATELESS_CONFIGURATION = "Default Stateless
SessionBean";
public static String DEFAULT_STATEFUL_CONFIGURATION = "Default Stateful
SessionBean";
public static String DEFAULT_ENTITY_BMP_CONFIGURATION = "Default BMP EntityBean";
public static String DEFAULT_ENTITY_CMP_CONFIGURATION = "Default CMP EntityBean";
public static String DEFAULT_MESSAGEDRIVEN_CONFIGURATION = "Default MesageDriven
Bean";
-
+
// Constants uses with container interceptor configurations
public static final int BMT = 1;
public static final int CMT = 2;
public static final int ANY = 3;
-
+
static final String BMT_VALUE = "Bean";
static final String CMT_VALUE = "Container";
static final String ANY_VALUE = "Both";
-
+
// Attributes
-
+
/**
-* A map of current deployments. If a deployment is made and it is
-* already in this map, then undeploy it first (i.e. make it a re-deploy).
-*/
+ * A map of current deployments. If a deployment is made and it is
+ * already in this map, then undeploy it first (i.e. make it a re-deploy).
+ */
HashMap deployments = new HashMap();
-
+
/** Verify EJB-jar contents on deployments */
boolean verifyDeployments = false;
-
+
/** Enable verbose verification. */
boolean verifierVerbose = false;
-
+
/** Enable metrics interceptor */
boolean metricsEnabled = false;
-
+
/** Enable JMS monitoring of the bean cache */
private boolean m_beanCacheJMSMonitoring;
-
+
/** A flag indicating if deployment descriptors should be validated */
private boolean validateDTDs;
-
+
// Public
-
+
/**
-* Returns the deployed applications.
-*/
+ * Returns the deployed applications.
+ */
public Iterator getDeployedApplications()
{
return deployments.values().iterator();
}
-
+
/**
-* Implements the abstract getObjectName() method in superclass
-* to return this service's name.
-*
-* @param server
-* @param name
-* @return
-*
-* @throws MalformedObjectNameException
-*/
+ * Implements the abstract getObjectName() method in superclass
+ * to return this service's name.
+ *
+ * @param server
+ * @param name
+ * @return
+ *
+ * @throws MalformedObjectNameException
+ */
public ObjectName getObjectName( MBeanServer server, ObjectName name )
- throws MalformedObjectNameException
+ throws MalformedObjectNameException
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java
User: mnf999
Date: 01/12/18 20:36:19
Modified:src/main/org/jboss/ejb Container.java
Log:
new invocation layer for the containers
Revision ChangesPath
1.64 +405 -311 jboss/src/main/org/jboss/ejb/Container.java
Index: Container.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Container.java2001/12/03 03:43:41 1.63
+++ Container.java2001/12/19 04:36:19 1.64
@@ -1,16 +1,18 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.ejb;
import java.lang.reflect.Method;
+import java.rmi.MarshalledObject; // tmp
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Iterator;
+import java.util.Map;
import java.util.HashMap;
import java.util.Set;
@@ -41,6 +43,8 @@
import org.jboss.deployment.DeploymentException;
+import org.jboss.invocation.Invocation;
+import org.jboss.invocation.MarshalledInvocation;
import org.jboss.ejb.BeanLockManager;
import org.jboss.logging.Logger;
import org.jboss.metadata.BeanMetaData;
@@ -56,110 +60,131 @@
import org.jboss.ejb.plugins.local.BaseLocalContainerInvoker;
/**
- * This is the base class for all EJB-containers in JBoss. A Container
- * functions as the central hub of all metadata and plugins. Through this
- * the container plugins can get hold of the other plugins and any metadata
- * they need.
- *
- * The ContainerFactory creates instances of subclasses of this class
- *and calls the appropriate initialization methods.
- *
- * A Container does not perform any significant work, but instead delegates
- *to the plugins to provide for all kinds of algorithmic functionality.
- *
- * @see ContainerFactory
- *
- * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @author mailto:[EMAIL PROTECTED]";>Scott Stark.
- * @author Bill Burke
- * @version $Revision: 1.63 $
- *
- * Revisions:
- *
- * 2001/07/26 bill burke:
- *
- * Added BeanLockManager.
- *
- * 2001/08/13 scott.stark:
- *
- * Added DynamicMBean support for method invocations and access to EJB
interfaces.
- *
- */
+* This is the base class for all EJB-containers in JBoss. A Container
+* functions as the central hub of all metadata and plugins. Through this
+* the container plugins can get hold of the other plugins and any metadata
+* they need.
+*
+* The ContainerFactory creates instances of subclasses of this class
+*and calls the appropriate initialization methods.
+*
+* A Container does not perform any significant work, but instead delegates
+*to the plugins to provide for all kinds of algorithmic functionality.
+*
+* @see ContainerFactory
+*
+* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
+* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+* @author mailto:[EMAIL PROTECTED]";>Scott Stark.
+* @author Bill Burke
+* @version $Revision: 1.64 $
+*
+* Revisions:
+*
+* 2001/07/26 bill burke:
+*
+* Added BeanLockManager.
+*
+* 2001/08/13 scott.stark:
+*
+* Added DynamicMBean support for method invocations and access to EJB
interfaces.
+*
+* 2001/12/18 marc fleury:
+*
+* Moved to new Invocation layer and detached invokers.
+* Use the method mappings for MarshalledInvocation.
+*
+*/
public abstract class Container implements DynamicMBean
{
// Constants -
-
+
// Attributes
-
+
/** Instance logger. */
protected Logger log = Logger.getLogger(this.getClass());
-
+
/** This is the application that this container is a part of */
protected Application application;
-
+
/**
-* This is the local classloader of this container. Used for loading
-* resources that must come from the local jar file for the container.
-* NOT for loading classes!
-*/
+ * This is the local classloader of this container. Used for loading
+ * resources that must come from the local jar file for the container.
+ * NOT for loading classes!
+ */
protected ClassLoader localClassLoader;
-
+
/**
-* This is the classloader of this container. All classes and resources that
-* the bean uses will be loaded from here. By doing this we make the bean
-* re-deployable
-*/
+ * This is the classloader of this container. All classes and re
Re: [JBoss-dev] CVS update: contrib/jboss.net/src/resources/plugin/META-INFjboss-service.xml
On Tue, 18 Dec 2001, marc fleury wrote: > -JBOSS-SYSTEM:service=Jetty > +JBOSS-SYSTEM:service=Jetty I like this name for this tag mucho better than the last. Could someone refresh my memory? This depends stuff only guarantees mbean start() order? Or does it mean that other mbeans will be fully configured and running before my mbean is even init()ed? ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [AUTOMATED] JBoss compilation failed
= ==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS= = HERE ARE THE LAST 50 LINES OF THE LOG FILE /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:586: cannot resolve symbol symbol : class ServiceDeploymentInfo location: class org.jboss.deployment.ServiceDeployer ServiceDeploymentInfo sdi = getSdi(url, false); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:701: cannot resolve symbol symbol : variable ServiceDeploymentInfo location: class org.jboss.deployment.ServiceDeployer sdi.state = ServiceDeploymentInfo.CLASSESLOADED; ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:766: cannot resolve symbol symbol : class ServiceDeploymentInfo location: class org.jboss.deployment.ServiceDeployer ServiceDeploymentInfo sdi = (ServiceDeploymentInfo)urlToServiceDeploymentInfoMap.get(url); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:766: cannot resolve symbol symbol : class ServiceDeploymentInfo location: class org.jboss.deployment.ServiceDeployer ServiceDeploymentInfo sdi = (ServiceDeploymentInfo)urlToServiceDeploymentInfoMap.get(url); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:771: cannot resolve symbol symbol : class ServiceDeploymentInfo location: class org.jboss.deployment.ServiceDeployer sdi = new ServiceDeploymentInfo(url); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/Application.java:35: org.jboss.ejb.Application should be declared abstract; it does not define init() in org.jboss.ejb.Application public class Application ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/Application.java:214: cannot resolve symbol symbol : method create () location: class org.jboss.ejb.Container con.create(); ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:340: warning: java.security.Identity in java.security has been deprecated public boolean isCallerInRole(Identity id) ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java:47: org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock should be declared abstract; it does not define schedule(org.jboss.invocation.Invocation) in org.jboss.ejb.plugins.lock.BeanLockSupport public class QueuedPessimisticEJBLock extends BeanLockSupport ^ /disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/plugins/lock/SimplePessimisticEJBLock.java:52: org.jboss.ejb.plugins.lock.SimplePessimisticEJBLock should be declared abstract; it does not define schedule(org.jboss.invocation.Invocation) in org.jboss.ejb.plugins.lock.BeanLockSupport public class SimplePessimisticEJBLock ^ 25 errors 4 warnings BUILD FAILED /disk/orig/home/lubega/jbossro/jboss-all/server/build.xml:378: Compile failed, messages should have been provided. Total time: 1 minute 1 second ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb BeanLock.java
User: mnf999 Date: 01/12/18 19:39:15 Modified:src/main/org/jboss/ejb BeanLock.java Log: MI->Invocation Revision ChangesPath 1.13 +3 -3 jboss/src/main/org/jboss/ejb/BeanLock.java Index: BeanLock.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/BeanLock.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- BeanLock.java 2001/11/24 20:43:22 1.12 +++ BeanLock.java 2001/12/19 03:39:14 1.13 @@ -10,7 +10,7 @@ import javax.transaction.Transaction; -import org.jboss.ejb.MethodInvocation; +import org.jboss.invocation.Invocation; /** * BeanLock interface @@ -18,7 +18,7 @@ * @author Bill Burke * @author Marc Fleury * - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ * * Revisions: * 2001/07/29: marcf @@ -75,7 +75,7 @@ * * @param mi The method invocation that needs a lock. */ - public void schedule(MethodInvocation mi) + public void schedule(Invocation mi) throws Exception; /** ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Application.java
User: mnf999
Date: 01/12/18 19:38:31
Modified:src/main/org/jboss/ejb Application.java
Log:
init()->create()
Revision ChangesPath
1.24 +3 -3 jboss/src/main/org/jboss/ejb/Application.java
Index: Application.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Application.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Application.java 2001/11/27 06:15:26 1.23
+++ Application.java 2001/12/19 03:38:31 1.24
@@ -30,7 +30,7 @@
* @see ContainerFactory
*
* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
*/
public class Application
implements Service
@@ -196,7 +196,7 @@
}
// Service implementation
- public void init() throws Exception {throw new Exception("don't call init");}
+ public void create() throws Exception {}
public void destroy(){}
/**
* The mbean Service interface start method calls
@@ -211,7 +211,7 @@
for (Iterator i = containers.values().iterator(); i.hasNext();)
{
Container con = (Container)i.next();
- con.init();
+ con.create();
}
for (Iterator i = containers.values().iterator(); i.hasNext();)
{
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/deployment ServiceDeployer.java
User: mnf999
Date: 01/12/18 19:36:12
Modified:src/main/org/jboss/deployment ServiceDeployer.java
Log:
Factored out the ServiceDeploymentInfo, rewrote the deployer to do create and start
as part of the "page" deployment
Revision ChangesPath
1.18 +476 -553 jboss/src/main/org/jboss/deployment/ServiceDeployer.java
Index: ServiceDeployer.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeployer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServiceDeployer.java 2001/12/09 05:24:25 1.17
+++ ServiceDeployer.java 2001/12/19 03:36:11 1.18
@@ -1,9 +1,9 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
package org.jboss.deployment;
@@ -43,289 +43,307 @@
import org.xml.sax.SAXException;
/**
- * This is the main Service Deployer API.
- *
- * @see org.jboss.system.Service
- * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
- * @author mailto:[EMAIL PROTECTED]";>David Maplesden
- * @author mailto:[EMAIL PROTECTED]";>David Jencks
- * @version $Revision: 1.17 $
- *
- * 20010830 marc fleury:
- * initial import
- *
- *
- *
- * 20010905 david maplesden:
- *
- * Changed deployment procedure to deploy all listed mbeans, then
- * initialise them all before finally starting them all. Changed services
- * sets to lists to maintain ordering.
- *
- *
- * 20010908 david jencks
- *
- * fixed tabs to spaces and log4j logging. Made the urlToServiceSet
- *map actually use the url supplied to deploy. Made postRegister use
- *deploy. Made undeploy work, and implemented sar dependency management
- *and recursive deploy/undeploy.
- *
- *
- * 20010907 david maplesden:
- *
- * Added support for "depends" tag
- *
- *
- */
+* This is the main Service Deployer API.
+*
+* @see org.jboss.system.Service
+* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+* @author mailto:[EMAIL PROTECTED]";>David Maplesden
+* @author mailto:[EMAIL PROTECTED]";>David Jencks
+* @version $Revision: 1.18 $
+*
+* 20010830 marc fleury:
+* initial import
+*
+*
+*
+* 20010905 david maplesden:
+*
+* Changed deployment procedure to deploy all listed mbeans, then
+* initialise them all before finally starting them all. Changed services
+* sets to lists to maintain ordering.
+*
+*
+* 20010908 david jencks
+*
+* fixed tabs to spaces and log4j logging. Made the urlToServiceSet
+*map actually use the url supplied to deploy. Made postRegister use
+*deploy. Made undeploy work, and implemented sar dependency management
+*and recursive deploy/undeploy.
+*
+*
+* 20010907 david maplesden:
+*
+* Added support for "depends" tag
+*
+*
+* 20011210 marc fleury:
+*
+* Removing the classpath dependency to explicit jars
+*
+* 20011211 marc fleury:
+*
+* rewrite
+*
+*/
public class ServiceDeployer
- extends DeployerMBeanSupport
- implements ServiceDeployerMBean
+extends DeployerMBeanSupport
+implements ServiceDeployerMBean
{
// Attributes
private ObjectName objectName;
-
+
//Find all the deployment info for a url
- private final Map urlToSarDeploymentInfoMap = new HashMap();
-
+ private final Map urlToServiceDeploymentInfoMap = new HashMap();
+
//Find what package an mbean came from.
private final Map objectNameToSupplyingPackageMap = new HashMap();
-
-
-
+
+
+
// Public
-
+
/**
-* Gets the Name of the ServiceDeployer object
-*
-* @return returns "ServiceDeployer"
-*/
+ * Gets the Name of the ServiceDeployer object
+ *
+ * @return returns "ServiceDeployer"
+ */
public String getName()
{
return "ServiceDeployer";
}
-
+
/**
-* Gets the FilenameFilter that the AutoDeployer uses to decide which files
-* will be deployed by the ServiceDeployer. Currently .jsr, .sar, and files
-* ending in service.xml are accepted.
-*
-* @return The FileNameFilter for use by the AutoDeployer.
-*/
+ * Gets the FilenameFilter that the AutoDeployer uses to decide which files
[JBoss-dev] jboss daily test failed
= ==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS= = HERE ARE THE LAST 50 LINES OF THE LOG FILE [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.SERVER_IL_FACTORY_KEY, OILServerILFactory.SERVER_IL_FACTORY); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:51: cannot resolve symbol [execmodules] symbol : variable OILServerILFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.SERVER_IL_FACTORY_KEY, OILServerILFactory.SERVER_IL_FACTORY); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:52: cannot resolve symbol [execmodules] symbol : variable OILServerILFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.CLIENT_IL_SERVICE_KEY, OILServerILFactory.CLIENT_IL_SERVICE); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:52: cannot resolve symbol [execmodules] symbol : variable OILServerILFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.CLIENT_IL_SERVICE_KEY, OILServerILFactory.CLIENT_IL_SERVICE); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:53: cannot resolve symbol [execmodules] symbol : variable OILServerILFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.PING_PERIOD_KEY, "1000"); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:54: cannot resolve symbol [execmodules] symbol : variable OILServerILFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.OIL_ADDRESS_KEY, "localhost"); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:55: cannot resolve symbol [execmodules] symbol : variable OILServerILFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] props.setProperty(OILServerILFactory.OIL_PORT_KEY,"8090"); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:57: cannot resolve symbol [execmodules] symbol : class SpyConnectionFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] QueueConnectionFactory cf = new SpyConnectionFactory(props); [execmodules] ^ [execmodules] /disk/orig/home/lubega/jbossro/jboss-all/testsuite/src/main/org/jboss/test/jbossmq/test/ConnectionUnitTestCase.java:61: cannot resolve symbol [execmodules] symbol : class SpyXAConnectionFactory [execmodules] location: class org.jboss.test.jbossmq.test.ConnectionUnitTestCase [execmodules] XAQueueConnectionFactory xacf = new SpyXAConnectionFactory(props); [execmodules] ^ [execmodules] 100 errors BUILD FAILED /disk/orig/home/lubega/jbossro/jboss-all/testsuite/build.xml:321: Compile failed, messages should have been provided. Total time: 47 seconds ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest/src/build build.xml
User: starksm Date: 01/12/18 19:01:24 Modified:src/build Tag: Branch_2_4 build.xml Log: Compile against the jboss.dist jars Revision ChangesPath No revision No revision 1.34.2.5 +14 -17jbosstest/src/build/Attic/build.xml Index: build.xml === RCS file: /cvsroot/jboss/jbosstest/src/build/Attic/build.xml,v retrieving revision 1.34.2.4 retrieving revision 1.34.2.5 diff -u -r1.34.2.4 -r1.34.2.5 --- build.xml 2001/12/09 10:51:31 1.34.2.4 +++ build.xml 2001/12/19 03:01:24 1.34.2.5 @@ -9,6 +9,7 @@ + @@ -29,25 +30,21 @@ - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [AUTOMATED] JBoss compilation failed
=
==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS=
=
HERE ARE THE LAST 50 LINES OF THE LOG FILE
location: class org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
log.debug("xml's from deployment: " + sdi.getXmlUrls());
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:304:
cannot resolve symbol
symbol : method createClassLoader ()
location: class org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
sdi.createClassLoader();
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:307:
cannot resolve symbol
symbol : method getXmlUrls ()
location: class org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
for (Iterator i = sdi.getXmlUrls().iterator(); i.hasNext();)
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:327:
cannot resolve symbol
symbol : method createClassLoader ()
location: class org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
sdi.createClassLoader();
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:606:
cannot resolve symbol
symbol : method removeClassLoader ()
location: class org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
ServiceLibraries.getLibraries().removeClassLoader(sdi.removeClassLoader());
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:608:
cannot resolve symbol
symbol : method cleanup (org.jboss.logging.Logger)
location: class org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
sdi.cleanup(getLog());
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:820:
inconvertible types
found : java.lang.Object
required: org.jboss.deployment.ServiceDeployer.SarDeploymentInfo
SarDeploymentInfo sdi = (SarDeploymentInfo)urlToSarDeploymentInfoMap.get(url);
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:821:
operator == cannot be applied to
org.jboss.deployment.ServiceDeployer.SarDeploymentInfo,
if (sdi == null)
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/deployment/ServiceDeployer.java:826:
put(java.lang.Object,java.lang.Object) in java.util.Map cannot be applied to
(java.net.URL,org.jboss.deployment.ServiceDeployer.SarDeploymentInfo)
urlToSarDeploymentInfoMap.put(url, sdi);
^
/disk/orig/home/lubega/jbossro/jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java:340:
warning: java.security.Identity in java.security has been deprecated
public boolean isCallerInRole(Identity id)
^
19 errors
4 warnings
BUILD FAILED
/disk/orig/home/lubega/jbossro/jboss-all/server/build.xml:378: Compile failed,
messages should have been provided.
Total time: 1 minute 39 seconds
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
