User: pra
Date: 02/03/06 09:27:49
Modified: src/main/org/jboss/mq/il/jvm JVMServerIL.java
JVMServerILFactory.java JVMServerILService.java
Log:
Commit of JBossMQ new JAAS based security architecture
Revision Changes Path
1.7 +21 -7 jbossmq/src/main/org/jboss/mq/il/jvm/JVMServerIL.java
Index: JVMServerIL.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/il/jvm/JVMServerIL.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JVMServerIL.java 2 Feb 2002 04:02:23 -0000 1.6
+++ JVMServerIL.java 6 Mar 2002 17:27:49 -0000 1.7
@@ -20,27 +20,28 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.il.ServerIL;
-import org.jboss.mq.server.JMSServer;
+import org.jboss.mq.server.JMSServerInvoker;
/**
* The JVM implementation of the ServerIL object
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
- * @version $Revision: 1.6 $
+ * @author <a href="[EMAIL PROTECTED]">Peter Antman</a>
+ * @version $Revision: 1.7 $
* @created August 16, 2001
*/
public class JVMServerIL implements org.jboss.mq.il.ServerIL
{
//The server implementation
- private final JMSServer server;
+ private final JMSServerInvoker server;
/**
* Constructor for the JVMServerIL object
*
* @param s Description of Parameter
*/
- public JVMServerIL(JMSServer s)
+ public JVMServerIL(JMSServerInvoker s)
{
if (s == null)
{
@@ -266,10 +267,10 @@
* @param id Description of Parameter
* @exception Exception Description of Exception
*/
- public void destroySubscription(DurableSubscriptionID id)
+ public void destroySubscription(ConnectionToken dc,DurableSubscriptionID id)
throws Exception
{
- server.destroySubscription(id);
+ server.destroySubscription(dc,id);
}
/**
@@ -285,7 +286,20 @@
{
return server.checkUser(userName, password);
}
-
+
+ /**
+ * Authenticate user
+ *
+ * @param userName Description of Parameter
+ * @param password Description of Parameter
+ * @return a sessionID
+ * @exception JMSException Description of Exception
+ */
+ public String authenticate(String userName, String password)
+ throws JMSException
+ {
+ return server.authenticate(userName, password);
+ }
/**
* #Description of the Method
1.3 +7 -3 jbossmq/src/main/org/jboss/mq/il/jvm/JVMServerILFactory.java
Index: JVMServerILFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/il/jvm/JVMServerILFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JVMServerILFactory.java 17 Aug 2001 03:04:03 -0000 1.2
+++ JVMServerILFactory.java 6 Mar 2002 17:27:49 -0000 1.3
@@ -10,14 +10,14 @@
import org.jboss.mq.il.ServerIL;
import org.jboss.mq.il.ServerILFactory;
-import org.jboss.mq.server.JMSServer;
+import org.jboss.mq.server.JMSServerInvoker;
/**
* Implements the ServerILFactory interface to create a new JVMServerIL
*
* @author David Maplesden
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JVMServerILFactory implements ServerILFactory {
@@ -31,7 +31,11 @@
*/
public ServerIL getServerIL()
throws Exception {
- return new JVMServerIL( JMSServer.getInstance() );
+ // We leave this for now, since a ServerIL seems to be bound in JNDI
+ // in JVMServerILService.bindJNDIReferences()
+ // FIXME, removed return of server, since it bypasses the new Invoker logic.
Where is this used?
+ //return new JVMServerIL( JMSServer.lookupJMSServer() );
+ throw new Exception("WOW, JVM does not find its server to invok.!!!");
}
1.8 +4 -3 jbossmq/src/main/org/jboss/mq/il/jvm/JVMServerILService.java
Index: JVMServerILService.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/il/jvm/JVMServerILService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JVMServerILService.java 2 Feb 2002 03:54:19 -0000 1.7
+++ JVMServerILService.java 6 Mar 2002 17:27:49 -0000 1.8
@@ -12,7 +12,7 @@
import org.jboss.mq.il.ServerIL;
import org.jboss.mq.il.ServerILJMXService;
-import org.jboss.mq.server.JMSServer;
+import org.jboss.mq.server.JMSServerInvoker;
import org.jboss.mq.il.ServerILFactory;
import org.jboss.system.ServiceMBeanSupport;
@@ -23,7 +23,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class JVMServerILService extends org.jboss.mq.il.ServerILJMXService
implements JVMServerILServiceMBean {
@@ -44,7 +44,8 @@
* @returns ServerIL the instance of this IL
*/
public ServerIL getServerIL() {
- return null;
+ return new JVMServerIL( lookupJMSServer() );
+ //return null;
}
/**
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development