[JBoss-dev] CVS update: jbosssx/src/main/org/jboss/security/plugins NullSecurityManager.java
User: starksm Date: 01/05/23 23:56:38 Added: src/main/org/jboss/security/plugins Tag: Branch_2_2 NullSecurityManager.java Log: Handle null password and add noop NullSecurityManager Revision ChangesPath No revision No revision 1.1.2.1 +1 -1 jbosssx/src/main/org/jboss/security/plugins/NullSecurityManager.java Index: NullSecurityManager.java === RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/plugins/NullSecurityManager.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- NullSecurityManager.java 2001/05/10 03:06:41 1.1 +++ NullSecurityManager.java 2001/05/24 06:56:38 1.1.2.1 @@ -24,7 +24,7 @@ @see #doesUserHaveRole(Principal, Set) @author [EMAIL PROTECTED] -@version $Revision: 1.1 $ +@version $Revision: 1.1.2.1 $ */ public class NullSecurityManager implements SubjectSecurityManager, RealmMapping, Serializable ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/lib jboss-jaas.jar jbosssx.jar jnpserver.jar tomcat-service.jar
User: starksm Date: 01/05/23 23:57:59 Modified:src/lib Tag: Branch_2_2 jboss-jaas.jar jbosssx.jar jnpserver.jar tomcat-service.jar Log: Update the jboss module jars Revision ChangesPath No revision No revision 1.2.2.4 +118 -12 jboss/src/lib/jboss-jaas.jar Binary file 1.2.2.4 +19 -34jboss/src/lib/jbosssx.jar Binary file 1.5.2.1 +82 -66jboss/src/lib/jnpserver.jar Binary file 1.9.2.2 +75 -75jboss/src/lib/tomcat-service.jar Binary file ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/client jbosssx-client.jar jnp-client.jar
User: starksm Date: 01/05/23 23:59:12 Modified:src/client Tag: Branch_2_2 jbosssx-client.jar jnp-client.jar Log: Update the client JBossSX and JBossNS jars Revision ChangesPath No revision No revision 1.2.2.4 +22 -7 jboss/src/client/jbosssx-client.jar Binary file 1.5.2.1 +61 -35jboss/src/client/jnp-client.jar Binary file ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/deployment J2eeDeployer.java
User: starksm
Date: 01/05/24 00:02:57
Modified:src/main/org/jboss/deployment Tag: Branch_2_2
J2eeDeployer.java
Log:
Switch the deploy order of ejbs/wars
Revision ChangesPath
No revision
No revision
1.20.2.1 +31 -29jboss/src/main/org/jboss/deployment/J2eeDeployer.java
Index: J2eeDeployer.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/J2eeDeployer.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- J2eeDeployer.java 2001/02/27 21:13:22 1.20
+++ J2eeDeployer.java 2001/05/24 07:02:57 1.20.2.1
@@ -65,7 +65,7 @@
* (ContainerFactory for JBoss and EmbededTomcatService for Tomcat).
*
* @author a href=mailto:[EMAIL PROTECTED];Daniel Schulze/a
-* @version $Revision: 1.20 $
+* @version $Revision: 1.20.2.1 $
*/
public class J2eeDeployer
extends ServiceMBeanSupport
@@ -400,13 +400,28 @@
String message;
try
{
- // Tomcat
- Iterator it = _d.webModules.iterator ();
+ // Deploy the ejb modules
+ moduleName = _d.name;
+ Vector tmp = new java.util.Vector();
+ Iterator it = _d.ejbModules.iterator();
+ while( it.hasNext() )
+ {
+ m = (Deployment.Module) it.next();
+ tmp.add( m.localUrls.firstElement().toString() );
+ }
+ String[] jarUrls = new String[ tmp.size() ];
+ tmp.toArray( jarUrls );
+ // Call the ContainerFactory that is loaded in the JMX server
+ server.invoke(jarDeployer, deploy,
+new Object[]{ _d.localUrl.toString(), jarUrls },
+new String[]{ String.class.getName(), String[].class.getName() } );
+
+ // Deploy the web application modules
+ it = _d.webModules.iterator ();
if (it.hasNext() !warDeployerAvailable())
throw new J2eeDeploymentException (application contains war
files but no web container available);
-
-
- while (it.hasNext ())
+
+ while( it.hasNext() )
{
m = (Deployment.Module)it.next ();
moduleName = m.name;
@@ -419,26 +434,12 @@
// since tomcat changes the context classloader...
Thread.currentThread().setContextClassLoader (appCl);
}
-
- // JBoss
- // gather the ejb module urls and deploy the application
- moduleName = _d.name;
- Vector tmp = new java.util.Vector();
- for( it = _d.ejbModules.iterator(); it.hasNext(); )
- {
- m = (Deployment.Module) it.next();
- tmp.add( m.localUrls.firstElement().toString() );
- }
- String[] jarUrls = new String[ tmp.size() ];
- tmp.toArray( jarUrls );
- // Call the ContainerFactory that is loaded in the JMX server
- server.invoke(jarDeployer, deploy,
-new Object[]{ _d.localUrl.toString(), jarUrls }, new String[]{
String.class.getName(), String[].class.getName() } );
}
- catch (MBeanException _mbe)
+ catch (MBeanException e)
{
log.error (Starting +moduleName+ failed!);
- throw new J2eeDeploymentException (Error while starting +moduleName+:
+ _mbe.getTargetException ().getMessage (), _mbe.getTargetException ());
+ e.getTargetException().printStackTrace();
+ throw new J2eeDeploymentException (Error while starting +moduleName+:
+ e.getTargetException ().getMessage (), e.getTargetException ());
}
catch (RuntimeErrorException e)
{
@@ -452,10 +453,11 @@
e.getTargetException ().printStackTrace();
throw new J2eeDeploymentException (Error while starting +moduleName+:
+ e.getTargetException ().getMessage (), e.getTargetException ());
}
- catch (JMException _jme)
+ catch (JMException e)
{
log.error (Starting failed!);
- throw new J2eeDeploymentException (Fatal error while interacting with
deployer MBeans... + _jme.getMessage ());
+ e.printStackTrace();
+ throw new J2eeDeploymentException (Fatal error while interacting with
deployer MBeans... + e.getMessage ());
}
finally
{
@@ -475,10 +477,6 @@
ClassLoader oldCl = Thread.currentThread().getContextClassLoader ();
StringBuffer error = new StringBuffer ();
- // stop the jar modules (the ContainerFactory is responsible for undeploying
- // all jars associated w/ a given application)
- stopModule( jarDeployer, _d.name, _d.localUrl.toString(), error );
-
// stop the web modules
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java
User: starksm
Date: 01/05/24 00:04:00
Modified:src/main/org/jboss/ejb Tag: Branch_2_2 Container.java
Log:
Use the immeadiate jndi-name or res-url if no resource-name was given
Revision ChangesPath
No revision
No revision
1.37.2.1 +7 -7 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.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- Container.java2001/02/27 16:48:07 1.37
+++ Container.java2001/05/24 07:04:00 1.37.2.1
@@ -67,7 +67,7 @@
* @see ContainerFactory
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author a href=[EMAIL PROTECTED]Marc Fleury/a
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.37.2.1 $
*/
public abstract class Container
{
@@ -467,6 +467,10 @@
String resourceName = ref.getResourceName();
String finalName = application.getResourceByName(resourceName);
+ /* If there was no resource-manager specified then an immeadiate
+jndi-name or res-url name should have been given */
+ if (finalName == null)
+ finalName = ref.getJndiName();
if (finalName == null)
{
@@ -497,16 +501,12 @@
}
}
- if (ref.getType().equals(javax.sql.DataSource))
- {
- // Datasource bindings
- bind(ctx, ref.getRefName(), new LinkRef(finalName));
- }
- else if (ref.getType().equals(java.net.URL))
+ if (ref.getType().equals(java.net.URL))
{
// URL bindings
try
{
+ Logger.debug(Binding URL +finalName+ to JDNI ENC
+ref.getRefName());
bind(ctx, ref.getRefName(), new URL(finalName));
} catch (MalformedURLException e)
{
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins SecurityInterceptor.java
User: starksm
Date: 01/05/24 00:04:45
Modified:src/main/org/jboss/ejb/plugins Tag: Branch_2_2
SecurityInterceptor.java
Log:
Improve the SecurityException message
Revision ChangesPath
No revision
No revision
1.13.2.2 +8 -5 jboss/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java
Index: SecurityInterceptor.java
===
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- SecurityInterceptor.java 2001/04/01 01:52:05 1.13.2.1
+++ SecurityInterceptor.java 2001/05/24 07:04:45 1.13.2.2
@@ -39,7 +39,7 @@
@author a href=[EMAIL PROTECTED]Oleg Nitz/a
@author [EMAIL PROTECTED]
-@version $Revision: 1.13.2.1 $
+@version $Revision: 1.13.2.2 $
*/
public class SecurityInterceptor extends AbstractInterceptor
{
@@ -208,8 +208,9 @@
Object credential = mi.getCredential();
if( principal == null || securityManager.isValid(principal, credential) ==
false )
{
-Logger.error(Authentication exception, principal=+principal);
-SecurityException e = new SecurityException(Authentication exception);
+String msg = Authentication exception, principal=+principal;
+Logger.error(msg);
+SecurityException e = new SecurityException(msg);
throw new RemoteException(checkSecurityAssociation, e);
}
else
@@ -225,8 +226,10 @@
if( methodRoles == null || realmMapping.doesUserHaveRole(principal,
methodRoles) == false )
{
String method = mi.getMethod().getName();
-Logger.error(Illegal access, principal=+principal+ method=+method);
-SecurityException e = new SecurityException(Illegal access exception);
+String msg = Insufficient method permissions, principal=+principal
++ , method=+method+, requiredRoles=+methodRoles;
+Logger.error(msg);
+SecurityException e = new SecurityException(msg);
throw new RemoteException(checkSecurityAssociation, e);
}
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [ jboss-Change Notes-426871 ] Tomcat 3.2.x updates
Change Notes item #426871, was updated on 2001-05-24 00:15 You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426871group_id=22866 Category: None Group: v2.2.2 Status: Open Priority: 5 Submitted By: Scott M Stark (starksm) Assigned to: Nobody/Anonymous (nobody) Summary: Tomcat 3.2.x updates Initial Comment: Update tomcat to use the JBossSecurityMgrRealm which uses the JBossSX security api for authentication and authorization. Updated web-app.xml parsing to provide complete support for set of the java:comp/env JNDI namespace. -- You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426871group_id=22866 ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [ jboss-Change Notes-426872 ] Make message-selector optional
Change Notes item #426872, was updated on 2001-05-24 00:17 You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426872group_id=22866 Category: None Group: v2.2.2 Status: Open Priority: 5 Submitted By: Scott M Stark (starksm) Assigned to: Nobody/Anonymous (nobody) Summary: Make message-selector optional Initial Comment: Made the message driven bean message-selector element optional. -- You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426872group_id=22866 ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [ jboss-Change Notes-426873 ] EJB/WAR deployment ordering changed
Change Notes item #426873, was updated on 2001-05-24 00:18 You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426873group_id=22866 Category: None Group: v2.2.2 Status: Open Priority: 5 Submitted By: Scott M Stark (starksm) Assigned to: Nobody/Anonymous (nobody) Summary: EJB/WAR deployment ordering changed Initial Comment: The deployment order of ejb jars and wars has been changed so that wars are deployed before ejbs. This allows servlets that are loaded on startup to access ejbs from within their init method. Likewise, wars are now undeployed before ejbs so that servlets can access ejbs from within their destroy method. See bug item #421956 for additional details. -- You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426873group_id=22866 ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [ jboss-Change Notes-426878 ] JNDI jnp changes
Change Notes item #426878, was updated on 2001-05-24 00:32 You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426878group_id=22866 Category: None Group: v2.2.2 Status: Open Priority: 5 Submitted By: Scott M Stark (starksm) Assigned to: Nobody/Anonymous (nobody) Summary: JNDI jnp changes Initial Comment: Added support for jnp: urls passed into the IntialContext as the provider url property, bug #416817. Fixed problem with resolving jnp: url, bug #419015. -- You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=381174aid=426878group_id=22866 ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: manual/src/docs howtojbuilderdebug.xml
User: gropi Date: 01/05/24 02:13:29 Modified:src/docs howtojbuilderdebug.xml Log: Minor updates by John P. Coffey. Revision ChangesPath 1.4 +15 -10manual/src/docs/howtojbuilderdebug.xml Index: howtojbuilderdebug.xml === RCS file: /cvsroot/jboss/manual/src/docs/howtojbuilderdebug.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- howtojbuilderdebug.xml2001/05/22 17:36:07 1.3 +++ howtojbuilderdebug.xml2001/05/24 09:13:29 1.4 @@ -3,9 +3,10 @@ titleIntegrating JBuilder 4.0 Foundation with JBoss for source level debugging/title paraAuthor:author - firstnameJohn/firstname + firstnameJohn P./firstname surnameCoffey/surname /author + email[EMAIL PROTECTED]/email /para section titleInstall the JBoss Server/title @@ -274,20 +275,24 @@ /para /section section -titleStart a client test application as a separate JBuilder application instance/title +titleStart the Client Test Application/title para If you include a client test code in your project you can debug this also (even though the project's main execution class is specified as -'org.jboss.Main'. To do this, launch a 2nd instance of JBuilder in another -window, then select the client class containing the Main() entry with the -right mouse button and select the debug popup context menu option. (nice one -again JBuilder). You should be aware though that this will be running from -the JBOSS_TOMCAST_HOME/jboss/bin directory as that is where we set the -project to execute from. If all goes well you should have your other -JBuilder instance stop in the breakpoints you set. +'org.jboss.Main'. To do this, select the test client class from the project +class pane and from the popup context meny, select debug. You should be +aware though that this debug session will run from the +$JBOSS_TOMCAST_HOME/jboss/bin directory since this is where we set the ejb +project to execute from (see above). If all goes well, you will have 2 +running tabs in the messages window, one of these will be called Main (this +is the JBoss server process and this is where you can single step through +EJB code while the other is the test client. One thing though, the timeouts +are somewhat short so if you spend too much time in a method within the EJB +you may find that transactions are rolled back. /para para -If anyone spots some ommissions in this how-to please let me know. +If anyone has suggestions of feedback please let me know, I can be contacted +via email at [EMAIL PROTECTED] /para /section /section ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/tomcat/src/main/org/jboss/tomcat ContextClassLoaderInterceptor.java
User: starksm Date: 01/05/24 07:06:48 Modified:tomcat/src/main/org/jboss/tomcat ContextClassLoaderInterceptor.java Log: Added a @deprecated tag since this is no longer needed with the EmbededTomcatServiceSX Revision ChangesPath 1.7 +3 -4 contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java Index: ContextClassLoaderInterceptor.java === RCS file: /cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ContextClassLoaderInterceptor.java2001/05/11 19:06:25 1.6 +++ ContextClassLoaderInterceptor.java2001/05/24 14:06:47 1.7 @@ -17,7 +17,9 @@ * * @author a href=mailto:[EMAIL PROTECTED];Rickard Öberg/a * @author a href=mailto:[EMAIL PROTECTED];Sebastien Alborini/a - * @version $Revision: 1.6 $ + * @author [EMAIL PROTECTED] + * @version $Revision: 1.7 $ + * @deprecated No longer needed with the EmbededTomcatServiceSX */ public class ContextClassLoaderInterceptor extends BaseInterceptor @@ -30,9 +32,6 @@ acl.setParent(tcl); ClassLoader scl = (ClassLoader) context.getServletLoader().getClassLoader(); Thread.currentThread().setContextClassLoader(scl); -System.out.println(ContextClassLoaderInterceptor, tcl=+tcl); -System.out.println(ContextClassLoaderInterceptor, acl=+acl); -System.out.println(ContextClassLoaderInterceptor, scl=+scl); } } ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [ jboss-Feature Requests-426946 ] log4j DOMConfigurator
Feature Requests item #426946, was updated on 2001-05-24 07:38
You can respond by visiting:
http://sourceforge.net/tracker/?func=detailatid=376688aid=426946group_id=22866
Category: None
Group: None
Status: Open
Priority: 5
Submitted By: Paul Austin (p_d_austin)
Assigned to: Nobody/Anonymous (nobody)
Summary: log4j DOMConfigurator
Initial Comment:
The current Log4jService looks for a file called
log4jproperties or the user can specify a file name to
load. What would be useful is if the file ends
with .xml it should use the DOMConfigurator to load
the file.
The following import would be added.
import org.apache.log4j.xml.DOMConfigurator;
The start() method would change as below.
public void start() throws Exception
{
boolean isXml = (configurationPath.indexOf
(.xml) != -1);
// Make sure the config file can be found
ClassLoader loader = Thread.currentThread
().getContextClassLoader();
URL url = loader.getResource
(configurationPath);
if( url == null )
throw new FileNotFoundException(Failed to
find logj4 props: +configurationPath);
if( refreshFlag )
{
// configurationPath is a file path
String path = url.getFile();
if (isXml) {
DOMConfigurator.configureAndWatch
(path, 1000*refreshPeriod);
} else {
PropertyConfigurator.configureAndWatch
(path, 1000*refreshPeriod);
}
}
else
{
if (isXml) {
DOMConfigurator.configure(url);
} else {
PropertyConfigurator.configure(url);
}
}
this.category = Category.getRoot();
category.info(Started Log4jService,
config=+url);
}
Cheers,
Paul
--
You can respond by visiting:
http://sourceforge.net/tracker/?func=detailatid=376688aid=426946group_id=22866
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/tomcat/src/main/org/jboss/tomcat/security JBossSecurityMgrRealm.java
User: starksm
Date: 01/05/24 08:36:40
Added: tomcat/src/main/org/jboss/tomcat/security Tag: Branch_2_2
JBossSecurityMgrRealm.java
Log:
Merge 2.3 changes into 2.2 branch
Revision ChangesPath
No revision
No revision
1.1.2.1 +28 -19
contrib/tomcat/src/main/org/jboss/tomcat/security/JBossSecurityMgrRealm.java
Index: JBossSecurityMgrRealm.java
===
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/security/JBossSecurityMgrRealm.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- JBossSecurityMgrRealm.java2001/05/11 19:06:26 1.1
+++ JBossSecurityMgrRealm.java2001/05/24 15:36:40 1.1.2.1
@@ -9,7 +9,6 @@
import javax.naming.NamingException;
import javax.security.auth.Subject;
-import org.apache.log4j.Category;
import org.apache.tomcat.core.BaseInterceptor;
import org.apache.tomcat.core.Context;
import org.apache.tomcat.core.Request;
@@ -36,13 +35,13 @@
@see org.jboss.security.SubjectSecurityManager
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.1.2.1 $
*/
public class JBossSecurityMgrRealm extends BaseInterceptor
{
-static Category category =
Category.getInstance(JBossSecurityMgrRealm.class.getName());
-public String subjectAttributeName = j_subject;
-public boolean useJAAS = false;
+private String subjectAttributeName = j_subject;
+private boolean useJAAS = false;
+private boolean debug = false;
/** A flag to indicate if the security manager implements the
SubjectSecurityManager
rather than EJBSecurityManager. When true, the authenticated Subject is
obtained
@@ -60,6 +59,14 @@
{
this.subjectAttributeName = subjectAttributeName;
}
+public boolean getDebug()
+{
+return debug;
+}
+public void setDebug(boolean debug)
+{
+this.debug = debug;
+}
public int authenticate(Request request, Response response)
{
@@ -80,11 +87,11 @@
*/
ClassLoader cl = Thread.currentThread().getContextClassLoader();
ClassLoader scl = request.getContext().getServletLoader().getClassLoader();
-if( category.isDebugEnabled() )
+if( debug )
{
-category.debug(Authenticating access, username: + username +
+request);
-category.debug(ClassLoader: +cl.toString()+':'+cl.hashCode());
-category.debug(Servlet ClassLoader:
+scl.toString()+':'+cl.hashCode());
+System.out.println(Authenticating access, username: + username +
+request);
+System.out.println(ClassLoader: +cl.toString()+':'+cl.hashCode());
+System.out.println(Servlet ClassLoader:
+scl.toString()+':'+cl.hashCode());
}
try
{
@@ -100,7 +107,7 @@
Context ctx = request.getContext();
if (ctx != null)
request.setAuthType(ctx.getAuthMethod());
-category.debug(User: +username+ is authenticated);
+System.out.println(User: +username+ is authenticated);
SecurityAssociation.setPrincipal(principal);
SecurityAssociation.setCredential(password.toCharArray());
if( useJAAS == true securityMgr instanceof
SubjectSecurityManager )
@@ -112,12 +119,13 @@
}
else
{
-category.debug(User: +username+ is NOT authenticated);
+System.out.println(User: +username+ is NOT authenticated);
}
}
catch(NamingException e)
{
-category.error(Error during authenticate, e);
+System.out.println(Error during authenticate);
+e.printStackTrace();
}
finally
{
@@ -147,11 +155,11 @@
*/
ClassLoader cl = Thread.currentThread().getContextClassLoader();
ClassLoader scl = request.getContext().getServletLoader().getClassLoader();
-if( category.isDebugEnabled() )
+if( debug )
{
-category.debug(Authorizing access, username: + username +
+request);
-category.debug(ClassLoader: +cl.toString()+':'+cl.hashCode());
-category.debug(Servlet ClassLoader:
+scl.toString()+':'+cl.hashCode());
+System.out.println(Authorizing access, username: + username +
+request);
+System.out.println(ClassLoader: +cl.toString()+':'+cl.hashCode());
+System.out.println(Servlet ClassLoader:
+scl.toString()+':'+cl.hashCode());
}
int code = 0;
try
[JBoss-dev] CVS update: contrib/tomcat/src/main/org/jboss/tomcat EmbeddedTomcatServiceSX.java EmbeddedTomcatServiceSXMBean.java ContextClassLoaderInterceptor.java TomcatEntry.java
User: starksm
Date: 01/05/24 08:36:40
Modified:tomcat/src/main/org/jboss/tomcat Tag: Branch_2_2
ContextClassLoaderInterceptor.java TomcatEntry.java
Added: tomcat/src/main/org/jboss/tomcat Tag: Branch_2_2
EmbeddedTomcatServiceSX.java
EmbeddedTomcatServiceSXMBean.java
Log:
Merge 2.3 changes into 2.2 branch
Revision ChangesPath
No revision
No revision
1.5.2.1 +8 -3
contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java
Index: ContextClassLoaderInterceptor.java
===
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- ContextClassLoaderInterceptor.java2000/12/21 16:29:48 1.5
+++ ContextClassLoaderInterceptor.java2001/05/24 15:36:40 1.5.2.1
@@ -17,7 +17,9 @@
*
* @author a href=mailto:[EMAIL PROTECTED];Rickard Öberg/a
* @author a href=mailto:[EMAIL PROTECTED];Sebastien Alborini/a
- * @version $Revision: 1.5 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.5.2.1 $
+ * @deprecated No longer needed with the EmbededTomcatServiceSX
*/
public class ContextClassLoaderInterceptor
extends BaseInterceptor
@@ -25,8 +27,11 @@
public void contextInit( Context context)
throws TomcatException
{
-
((AdaptiveClassLoader)context.getServletLoader().getParentLoader()).setParent(Thread.currentThread().getContextClassLoader());
-
Thread.currentThread().setContextClassLoader(((ClassLoader)context.getServletLoader().getClassLoader()));
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ AdaptiveClassLoader acl = (AdaptiveClassLoader)
context.getServletLoader().getParentLoader();
+ acl.setParent(tcl);
+ ClassLoader scl = (ClassLoader) context.getServletLoader().getClassLoader();
+ Thread.currentThread().setContextClassLoader(scl);
}
}
1.2.2.1 +16 -5 contrib/tomcat/src/main/org/jboss/tomcat/TomcatEntry.java
Index: TomcatEntry.java
===
RCS file: /cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/TomcatEntry.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TomcatEntry.java 2001/02/20 15:29:00 1.2
+++ TomcatEntry.java 2001/05/24 15:36:40 1.2.2.1
@@ -65,11 +65,15 @@
private Hashtable extraClassPaths = new Hashtable();
-public TomcatEntry() {
+public TomcatEntry()
+{
+this(new String[0]);
+}
+public TomcatEntry(String[] args)
+{
try
{
-String[] args = new String[0];
- execute( args );
+execute( args );
}
catch (Exception e)
{
@@ -79,6 +83,14 @@
public ServletContext addContext( String ctxPath, URL docRoot )
{
+Context ctx = addRawContext(ctxPath, docRoot);
+ServletContext servletCtx = null;
+if( ctx != null )
+servletCtx = ctx.getFacade();
+return servletCtx;
+}
+public Context addRawContext( String ctxPath, URL docRoot )
+{
// tomcat supports only file-based contexts
if( ! file.equals( docRoot.getProtocol()) ) {
// log( addContext() invalid docRoot: + docRoot );
@@ -95,7 +107,7 @@
m_contextMgr.addContext( ctx );
if (m_facadeMgr == null)
m_facadeMgr = ctx.getFacadeManager();
-return ctx.getFacade();
+return ctx;
} catch( Exception ex ) {
ex.printStackTrace();
}
@@ -323,7 +335,6 @@
System.out.println(sm.getString(tomcat.start));
m_contextMgr.init(); // set up contexts
-
m_contextMgr.start(); // start serving
}
No revision
No revision
1.1.2.1 +5 -14
contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceSX.java
Index: EmbeddedTomcatServiceSX.java
===
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceSX.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- EmbeddedTomcatServiceSX.java 2001/05/23 18:26:33 1.1
+++ EmbeddedTomcatServiceSX.java 2001/05/24 15:36:40 1.1.2.1
@@ -29,13 +29,10 @@
import org.w3c.dom.Element;
import org.jboss.ejb.DeploymentException;
-import org.jboss.logging.log4j.CategoryStream;
[JBoss-dev] CVS update: contrib/tomcat/src/build build.xml
User: starksm
Date: 01/05/24 08:36:40
Modified:tomcat/src/build Tag: Branch_2_2 build.xml
Log:
Merge 2.3 changes into 2.2 branch
Revision ChangesPath
No revision
No revision
1.12.2.1 +97 -64contrib/tomcat/src/build/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/tomcat/src/build/build.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- build.xml 2001/04/19 17:55:36 1.12
+++ build.xml 2001/05/24 15:36:39 1.12.2.1
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=UTF-8 ?
-!-- $Id: build.xml,v 1.12 2001/04/19 17:55:36 starksm Exp $ --
+!-- $Id: build.xml,v 1.12.2.1 2001/05/24 15:36:39 starksm Exp $ --
!-- An Ant build file for the tomcat-service jar and the
JBoss/Tomcat bundle. The buildfile requires a JBoss dist
@@ -9,75 +9,108 @@
project name=tomcat-service default=jar basedir=../..
- property name=name value=tomcat-service/
- property name=lib.dir value=${basedir}/lib/
- property name=src.dir value=${basedir}/src/main/
- property name=src.resources value=${basedir}/src/resources/
- property name=etc.dir value=${basedir}/src/etc/
- property name=build.dir value=${basedir}/build/
- property name=build.classes.dir value=${build.dir}/classes/
- property name=jar.file value=${name}.jar/
- property name=test.client value=tomcat-test/
- property name=bundle.name value=JBoss-2.2.1_Tomcat-3.2.1 /
- property name=bundle.dir value=bundle /
- property name=bundle.root value=${bundle.dir}/${bundle.name} /
- path id=base.path
-pathelement location=${jboss.dist}/client/jbosssx-client.jar/
-pathelement location=${jboss.dist}/client/jnp-client.jar/
-pathelement location=${jboss.dist}/client/jta-spec1_0_1.jar/
-pathelement location=${jboss.dist}/lib/jdbc2_0-stdext.jar/
-pathelement location=${jboss.dist}/lib/jaxp.jar/
-pathelement location=${jboss.dist}/lib/crimson.jar/
-pathelement location=${jboss.dist}/lib/jmxri.jar/
-pathelement location=${jboss.dist}/lib/ext/ejb.jar/
-pathelement location=${jboss.dist}/lib/ext/jboss.jar/
-pathelement location=${tomcat.dist}/lib/webserver.jar/
-pathelement location=${tomcat.dist}/lib/servlet.jar/
-pathelement location=${tomcat.dist}/lib/servlet.jar/
-pathelement location=${build.classes.dir}/
- /path
- property name=classpath refid=base.path/
-
- target name=init
-echo message=Using jboss.dist=${jboss.dist} /
-echo message=Using tomcat.dist=${tomcat.dist} /
-echo message=Using classpath=${classpath} /
- /target
+!-- Default values for jboss.dist tomcat.dist that should be overriden --
+property name=jboss.dist value=${basedir}/../../jboss/dist/
+property name=tomcat.dist value=${basedir}/jakarta-tomcat-3.2.1/
+
+property name=name value=tomcat-service/
+property name=lib.dir value=${basedir}/lib/
+property name=src.dir value=${basedir}/src/main/
+property name=src.resources value=${basedir}/src/resources/
+property name=etc.dir value=${basedir}/src/etc/
+property name=build.dir value=${basedir}/build/
+property name=build.classes.dir value=${build.dir}/classes/
+property name=jar.file value=${name}.jar/
+property name=test.client value=tomcat-test/
+property name=bundle.name value=JBoss-2.2.1_Tomcat-3.2.1 /
+property name=bundle.dir value=bundle /
+property name=bundle.root value=${bundle.dir}/${bundle.name} /
+path id=base.path_22
+pathelement location=${jboss.dist}/client/jaas.jar/
+pathelement location=${jboss.dist}/client/jbosssx-client.jar/
+pathelement location=${jboss.dist}/client/jnp-client.jar/
+pathelement location=${jboss.dist}/client/jta-spec1_0_1.jar/
+pathelement location=${jboss.dist}/lib/jdbc2_0-stdext.jar/
+pathelement location=${jboss.dist}/lib/jaxp.jar/
+pathelement location=${jboss.dist}/lib/crimson.jar/
+pathelement location=${jboss.dist}/lib/jmxri.jar/
+pathelement location=${jboss.dist}/lib/jboss-jaas.jar/
+pathelement location=${jboss.dist}/lib/ext/ejb.jar/
+pathelement location=${jboss.dist}/lib/ext/jboss.jar/
+pathelement location=${jboss.dist}/lib/ext/jbosssx.jar/
+pathelement location=${jboss.dist}/lib/ext/log4j.jar/
+pathelement location=${tomcat.dist}/lib/webserver.jar/
+pathelement location=${tomcat.dist}/lib/servlet.jar/
+pathelement location=${tomcat.dist}/lib/servlet.jar/
+pathelement location=${build.classes.dir}/
+/path
+path id=base.path_23
+pathelement location=${jboss.dist}/client/jaas.jar/
+pathelement location=${jboss.dist}/client/jbosssx-client.jar/
[JBoss-dev] CVS update: contrib/tomcat/src/main/org/jboss/tomcat/naming JbossWebXmlReader.java
User: starksm
Date: 01/05/24 08:36:40
Modified:tomcat/src/main/org/jboss/tomcat/naming Tag: Branch_2_2
JbossWebXmlReader.java
Log:
Merge 2.3 changes into 2.2 branch
Revision ChangesPath
No revision
No revision
1.3.2.1 +43 -199
contrib/tomcat/src/main/org/jboss/tomcat/naming/JbossWebXmlReader.java
Index: JbossWebXmlReader.java
===
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/naming/JbossWebXmlReader.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JbossWebXmlReader.java2000/12/21 16:30:36 1.3
+++ JbossWebXmlReader.java2001/05/24 15:36:40 1.3.2.1
@@ -6,221 +6,65 @@
*/
package org.jboss.tomcat.naming;
+import java.io.File;
+import java.io.IOException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
import org.apache.tomcat.core.BaseInterceptor;
import org.apache.tomcat.core.ContextManager;
import org.apache.tomcat.core.TomcatException;
-import org.apache.tomcat.util.StringManager;
-import org.apache.tomcat.util.xml.XmlMapper;
-
-import org.jnp.interfaces.Naming;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.LinkRef;
-import javax.naming.NamingException;
-import javax.naming.Name;
-import javax.naming.NameNotFoundException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
+import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
-/**
- * Reads the web.xml and jboss-web.xml file, doing JNDI associations.
- * @author a href=mailto:[EMAIL PROTECTED];Kevin Lewis/a
- * @version $Revision: 1.3 $
- */
+/** A ContextInterceptor that hooks into the context initialization sequence
+to delegate the JNDI env setup to the JBoss AbstractWebContainer. This must
+be configured AFTER the org.apache.tomcat.context.LoaderInterceptor so that
+the servlet class loader has been set on the Context.
+
+@author a href=mailto:[EMAIL PROTECTED];Kevin Lewis/a
+@author [EMAIL PROTECTED]
+@version $Revision: 1.3.2.1 $
+*/
public class JbossWebXmlReader
extends BaseInterceptor
{
- private static HashMap loaderMap = new HashMap();
-
- public static ClassLoader getClassLoaderFor(String docBase)
- {
- return (ClassLoader)loaderMap.get(docBase);
- }
-
public void contextInit(org.apache.tomcat.core.Context context)
throws TomcatException
{
try
{
- ContextManager contextManager = context.getContextManager();
-
Thread.currentThread().setContextClassLoader(((ClassLoader)context.getServletLoader().getClassLoader()));
- File webXml = contextManager.getAbsolute(new File(context.getDocBase() +
/WEB-INF/web.xml));
- File jbossWebXml = contextManager.getAbsolute(new
File(context.getDocBase() + /WEB-INF/jboss-web.xml));
-
- if(jbossWebXml.exists() webXml.exists())
- {
-loaderMap.put(context.getDocBase(),
Thread.currentThread().getContextClassLoader());
-processJbossWebXmlFile(jbossWebXml, webXml);
- }
- }
- catch(Exception exception)
- {
- exception.printStackTrace(System.out);
- }
- }
-
- private void processJbossWebXmlFile(File jbossWebXml, File webXml)
- throws javax.naming.NamingException
- {
- try
- {
- Context context = (Context)(new InitialContext().lookup(java:comp));
- context = context.createSubcontext(env);
-
- addToJndiContext(context, processJbossEnvEntries(webXml));
- addLinkRefsToJndiContext(context, processJbossEjbRefs(jbossWebXml));
- addLinkRefsToJndiContext(context, processJbossResourceRefs(jbossWebXml));
- }
- catch(Exception exception)
- {
- exception.printStackTrace(System.out);
- }
- }
-
- private void addLinkRefsToJndiContext(Context context, HashMap contextMap)
- throws Exception
- {
- Iterator names = contextMap.keySet().iterator();
- while(names.hasNext())
- {
- Object key = names.next();
- System.out.println(Binding +key+ to +contextMap.get(key));
- bind(context, (String)key, new LinkRef((String)contextMap.get(key)));
- }
- }
-
- private void addToJndiContext(Context context, HashMap contextMap)
- throws Exception
- {
- Iterator names = contextMap.keySet().iterator();
- while(names.hasNext())
- {
- Object key = names.next();
- bind(context, (String)key,
[JBoss-dev] CVS update: jboss/src/lib jnpserver.jar
User: starksm Date: 01/05/24 09:24:40 Modified:src/lib Tag: Branch_2_2 jnpserver.jar Log: Update jnp Main to not use log4j Revision ChangesPath No revision No revision 1.5.2.2 +31 -32jboss/src/lib/jnpserver.jar Binary file ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jnp/src/main/org/jnp/server Main.java
User: starksm
Date: 01/05/24 09:24:04
Modified:src/main/org/jnp/server Tag: Branch_2_2 Main.java
Log:
Don't use log4j in 2.2 as it conflicts with the default legacy logging
Revision ChangesPath
No revision
No revision
1.5.2.1 +17 -12jnp/src/main/org/jnp/server/Main.java
Index: Main.java
===
RCS file: /cvsroot/jboss/jnp/src/main/org/jnp/server/Main.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- Main.java 2001/04/26 07:50:52 1.5
+++ Main.java 2001/05/24 16:24:04 1.5.2.1
@@ -33,7 +33,7 @@
@author oberg
@author [EMAIL PROTECTED]
-@version $Revision: 1.5 $
+@version $Revision: 1.5.2.1 $
*/
public class Main
implements Runnable, MainMBean
@@ -78,7 +78,7 @@
// Set configuration from the system properties
setPort(Integer.getInteger(jnp.port,getPort()).intValue());
setRmiPort(Integer.getInteger(jnp.rmiPort,getRmiPort()).intValue());
-log = Category.getInstance(Naming);
+//log = Category.getInstance(Naming);
}
// Public
@@ -91,7 +91,7 @@
public void start()
throws Exception
{
-log.info(Starting jnp server);
+System.out.println(Starting jnp server);
// Create remote object
theServer = new NamingServer();
@@ -106,11 +106,12 @@
{
serverSocket = null;
serverSocket = new ServerSocket(getPort());
-log.info(Started jnpPort= + getPort()+, rmiPort=+getRmiPort());
+System.out.println(Started jnpPort= + getPort()+,
rmiPort=+getRmiPort());
listen();
} catch (IOException e)
{
-log.error(Could not start on port + getPort(), e);
+System.err.println(Could not start on port + getPort());
+e.printStackTrace();
}
}
@@ -118,7 +119,7 @@
{
try
{
-log.info(Stopping);
+System.out.println(Stopping);
// Unexport server
UnicastRemoteObject.unexportObject(theServer, false);
@@ -127,10 +128,11 @@
ServerSocket s = serverSocket;
serverSocket = null;
s.close();
-log.info(Stopped);
+System.out.println(Stopped);
} catch (Exception e)
{
-log.error(Exception during shutdown, e);
+System.err.println(Exception during shutdown);
+e.printStackTrace();
}
}
@@ -146,14 +148,16 @@
} catch (IOException e)
{
if (serverSocket == null) return; // Stopped by normal means
-log.error(Naming stopped, e);
-log.info(Restarting naming);
+System.err.println(Naming stopped);
+e.printStackTrace();
+System.out.println(Restarting naming);
try
{
start();
} catch (Exception ex)
{
-log.error(Restart failed, ex);
+System.err.println(Restart failed);
+ex.printStackTrace();
return;
}
}
@@ -169,7 +173,8 @@
}
catch (IOException ex)
{
-log.error(Error writing response, ex);
+System.err.println(Error writing response);
+ex.printStackTrace();
}
finally
{
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/util Info.java
User: starksm
Date: 01/05/24 10:53:35
Modified:src/main/org/jboss/util Tag: Branch_2_2 Info.java
Log:
Dump out the entire System properties as DEBUG priority msgs
Revision ChangesPath
No revision
No revision
1.4.2.1 +13 -4 jboss/src/main/org/jboss/util/Info.java
Index: Info.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/util/Info.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Info.java 2000/12/07 18:16:13 1.4
+++ Info.java 2001/05/24 17:53:35 1.4.2.1
@@ -6,8 +6,7 @@
*/
package org.jboss.util;
-import java.io.*;
-import java.net.*;
+import java.util.Enumeration;
import javax.management.*;
import javax.management.loading.MLet;
@@ -19,7 +18,8 @@
*
* @see related
* @author Rickard Öberg ([EMAIL PROTECTED])
- * @version $Revision: 1.4 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.4.2.1 $
*/
public class Info
implements InfoMBean, MBeanRegistration
@@ -39,11 +39,20 @@
public ObjectName preRegister(MBeanServer server, ObjectName name)
throws java.lang.Exception
{
+ // Dump out basic info as INFO priority msgs
log.log(Java version:
+System.getProperty(java.version)+,+System.getProperty(java.vendor));
log.log(Java VM: +System.getProperty(java.vm.name)+
+System.getProperty(java.vm.version)+,+System.getProperty(java.vm.vendor));
log.log(System: +System.getProperty(os.name)+
+System.getProperty(os.version)+,+System.getProperty(os.arch));
+ // Now dump out the entire System properties as DEBUG priority msgs
+ log.debug(+++ Full System Properties Dump);
+ Enumeration names = System.getProperties().propertyNames();
+ while( names.hasMoreElements() )
+ {
+ String pname = (String) names.nextElement();
+ log.debug(pname+: +System.getProperty(pname));
+ }
- // MF TODO: say everything that needs to be said here: copyright, included
libs and TM, contributor and (C) jboss org 2000
+ // MF TODO: say everything that needs to be said here: copyright, included
libs and TM, contributor and (C) jboss org 2000
return new ObjectName(OBJECT_NAME);
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
User: starksm
Date: 01/05/24 11:10:31
Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
Log:
Update versionIdentifier to 2.2.2
Revision ChangesPath
No revision
No revision
1.30.2.4 +2 -2 jboss/src/main/org/jboss/Main.java
Index: Main.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -u -r1.30.2.3 -r1.30.2.4
--- Main.java 2001/04/12 04:50:03 1.30.2.3
+++ Main.java 2001/05/24 18:10:31 1.30.2.4
@@ -32,13 +32,13 @@
* @see related
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author a href=mailto:[EMAIL PROTECTED];Daniel O'Connor/a.
- * @version $Revision: 1.30.2.3 $
+ * @version $Revision: 1.30.2.4 $
*/
public class Main
{
// Constants -
- String versionIdentifier = 2.2.1;
+ String versionIdentifier = 2.2.2;
// Attributes
// Static
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/tomcat/src/etc/conf/tomcat jboss.conf.patch jboss.jcml.patch server.xml.patch
User: starksm Date: 01/05/24 11:40:58 Modified:tomcat/src/etc/conf/tomcat Tag: Branch_2_2 jboss.conf.patch jboss.jcml.patch server.xml.patch Log: Update bundle config file patches Revision ChangesPath No revision No revision 1.1.2.1 +8 -10 contrib/tomcat/src/etc/conf/tomcat/jboss.conf.patch Index: jboss.conf.patch === RCS file: /cvsroot/jboss/contrib/tomcat/src/etc/conf/tomcat/jboss.conf.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- jboss.conf.patch 2001/04/18 02:40:41 1.1 +++ jboss.conf.patch 2001/05/24 18:40:58 1.1.2.1 @@ -1,11 +1,10 @@ -*** ../default/jboss.confTue Apr 17 13:28:07 2001 jboss.conf Tue Apr 17 13:30:03 2001 +*** jboss.conf Thu May 24 10:10:07 2001 +--- jboss.conf.tomcatThu May 24 10:14:12 2001 *** -*** 41,52 - /MLET +*** 42,52 -! !-- Uncomment to add Tomcat classes to classpath + !-- Uncomment to add Tomcat classes to classpath ! -- MLET CODE = org.jboss.util.ClassPathExtension ARCHIVE=jboss.jar CODEBASE=../../lib/ext/ ! -- ARG TYPE=java.lang.String VALUE=path to tomcat /lib goes here ! -- ARG TYPE=java.lang.String VALUE=Tomcat @@ -14,14 +13,13 @@ !-- Uncomment to add Jetty classes to classpath (make sure Arg1 ends in a slash) -- MLET CODE = org.jboss.util.ClassPathExtension ARCHIVE=jboss.jar CODEBASE=../../lib/ext/ 41,51 - /MLET +--- 42,51 -! !-- Uncomment to add Tomcat classes to classpath-- + !-- Uncomment to add Tomcat classes to classpath ! MLET CODE = org.jboss.util.ClassPathExtension ARCHIVE=jboss.jar CODEBASE=../../lib/ext/ -! ARG TYPE=java.lang.String VALUE=../../../tomcat/lib/ -! ARG TYPE=java.lang.String VALUE=Tomcat +! ARG TYPE=java.lang.String VALUE=../../../tomcat/lib/ +! ARG TYPE=java.lang.String VALUE=Tomcat ! /MLET !-- Uncomment to add Jetty classes to classpath (make sure Arg1 ends in a slash) 1.1.2.1 +4 -4 contrib/tomcat/src/etc/conf/tomcat/jboss.jcml.patch Index: jboss.jcml.patch === RCS file: /cvsroot/jboss/contrib/tomcat/src/etc/conf/tomcat/jboss.jcml.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- jboss.jcml.patch 2001/04/18 02:40:41 1.1 +++ jboss.jcml.patch 2001/05/24 18:40:58 1.1.2.1 @@ -1,12 +1,12 @@ -*** ../default/jboss.jcmlTue Apr 17 13:34:28 2001 jboss.jcml Tue Apr 17 13:37:50 2001 +*** jboss.jcml Thu May 24 10:18:58 2001 +--- jboss.jcml.tomcatThu May 24 10:18:15 2001 *** *** 116,124 attribute name=BeanCacheJMSMonitoringEnabledfalse/attribute /mbean ! !-- Uncomment to add embedded tomcat service -mbean code=org.jboss.tomcat.EmbeddedTomcatService name=DefaultDomain:service=EmbeddedTomcat / +mbean code=org.jboss.tomcat.EmbeddedTomcatServiceSX name=DefaultDomain:service=EmbeddedTomcat / --- !-- Uncomment and set file URL to add Jetty service (you can set config more than once) @@ -16,7 +16,7 @@ /mbean ! !-- Uncomment to add embedded tomcat service -- -mbean code=org.jboss.tomcat.EmbeddedTomcatService name=DefaultDomain:service=EmbeddedTomcat / +mbean code=org.jboss.tomcat.EmbeddedTomcatServiceSX name=DefaultDomain:service=EmbeddedTomcat / !-- Uncomment and set file URL to add Jetty service (you can set config more than once) mbean code=org.jboss.jetty.JettyService name=DefaultDomain:service=Jetty 1.3.2.1 +63 -23contrib/tomcat/src/etc/conf/tomcat/server.xml.patch Index: server.xml.patch === RCS file: /cvsroot/jboss/contrib/tomcat/src/etc/conf/tomcat/server.xml.patch,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- server.xml.patch 2001/04/18 20:19:33 1.3 +++ server.xml.patch 2001/05/24 18:40:58 1.3.2.1 @@ -1,8 +1,12 @@ *** server.xml Tue Dec 12 13:36:20 2000 server.jboss.xml Wed Apr 18 13:21:15 2001 +--- server.jboss.xml Thu May 24 09:52:03 2001 *** -*** 124,135 +*** 120,135 ContextInterceptor + className=org.apache.tomcat.context.LoaderInterceptor / + ContextInterceptor + className=org.apache.tomcat.context.DefaultCMSetter / + ContextInterceptor className=org.apache.tomcat.context.WorkDirInterceptor / ! !-- Request processing -- @@ -14,18 +18,16 @@ RequestInterceptor
[JBoss-dev] CVS update: contrib/tomcat/src/build build.xml
User: starksm
Date: 01/05/24 11:40:21
Modified:tomcat/src/build Tag: Branch_2_2 build.xml
Log:
Update bundle name to JBoss-2.2.2_Tomcat-3.2.1
Revision ChangesPath
No revision
No revision
1.12.2.2 +2 -2 contrib/tomcat/src/build/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/tomcat/src/build/build.xml,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- build.xml 2001/05/24 15:36:39 1.12.2.1
+++ build.xml 2001/05/24 18:40:20 1.12.2.2
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=UTF-8 ?
-!-- $Id: build.xml,v 1.12.2.1 2001/05/24 15:36:39 starksm Exp $ --
+!-- $Id: build.xml,v 1.12.2.2 2001/05/24 18:40:20 starksm Exp $ --
!-- An Ant build file for the tomcat-service jar and the
JBoss/Tomcat bundle. The buildfile requires a JBoss dist
@@ -22,7 +22,7 @@
property name=build.classes.dir value=${build.dir}/classes/
property name=jar.file value=${name}.jar/
property name=test.client value=tomcat-test/
-property name=bundle.name value=JBoss-2.2.1_Tomcat-3.2.1 /
+property name=bundle.name value=JBoss-2.2.2_Tomcat-3.2.1 /
property name=bundle.dir value=bundle /
property name=bundle.root value=${bundle.dir}/${bundle.name} /
path id=base.path_22
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] UserTransaction does't commit?
Howdy people ...
I have been building a client application that needs to manipulate several
tables through CMP Entity beans ... I read the post on 4/29 about
UserTransaction getting added to the JBOSS source. I downloaded yesterday's
snapshot of JBOSS (jboss-cvs.zip (5-23-01)) and took a crack at it ..
I am using:
Sun JDK 1.3
PostGreSQL 7.1
Windows 2000 Server
my CMP Entity Bean has a Required transaction attribute
Here's the summary of my problem: After issuing the commit() on the
transaction object, my changes are gone forever..
My usage of UserTransaction is simple ... I start a transaction with begin()
... then i go to the home interface and use a finder to get a bunch of
objects ... I grab the first object in the enumeration, do some hullabaloo
with it, then do a setRecord (it just a shortcut to set all of the bean's
fields) .. then i issue a commit() ... i've trimmed out some stuff to make
the following readable. The name of my bean is Event ... (yah, probably a
bad name, but whatever... ;)) ...
try{
initialContext = new InitialContext(env);
log(Got initial context...);
eventHome =
(EventHome)getHome(initialContext,myblah/Event,EventHome.class);
log(Got EventHome interface...);
trans =
(UserTransaction)getHome(initialContext,UserTransaction,UserTransaction.cl
ass);
log(Got UserTransaction interface);
}
catch(NamingException e){
log(NamingException during run() method initialization! + e);
return;
}
Event event = null;
int eventNumber = 0;
while(event != null || eventNumber++ == 0)
{
//We need to begin the transaction here ... if we don't, then the
//call to findByStatus...() is considered part of a different transaction
//and is not encapsulated ...
try{ //Transaction block
trans.begin();
log(Transaction begun...);
//Let's try to find an event
try{
Enumeration eventList =
eventHome.findByStatusOrderByPriority(EventRecord.STATUS_NEW);
//Reset the event
event = null;
//Grab the highest priority event out of the Enumeration
if(eventList != null eventList.hasMoreElements())
event = (Event)eventList.nextElement();
}
catch(FinderException fe){;}
catch(RemoteException re){
log(RemoteException while trying to get list of pending
events! + re);
}
//If an event was found, handle it
if(event != null)
{
EventRecord eventRec = event.getRecord();
log(This event is outstanding: + eventRec.event_id);
//log(eventRec.toString());
//Biz logic here
eventRec.update_date = new
Timestamp(System.currentTimeMillis());
if(EventRecord.STATUS_COMPLETE.equals(eventRec.status))
eventRec.completion_date = eventRec.update_date;
log(---BEFORE UPDATE-);
log(eventRec.toString());
event.setRecord(eventRec);
log(---AFTER UPDATE-);
log(event.getRecord().toString());
log(EventRecord has been updated...);
}
//Unless an exception was thrown, commit it
trans.commit();
log(Transaction committed...);
log(---AFTER COMMIT-);
log(event.getRecord().toString());
}
catch(Exception e){
log(Exception caught during event handling block! + e);
try{
trans.rollback();
log(Transaction rollback succeeded...);
}
catch(Exception rbe){
log(Rollback failed!!!);
}
}
}
Here's what gets output:
---begin
Trying to create InitialContext...
Got initial context...
lookup name: myblah/Event
Got EventHome interface...
lookup name: UserTransaction
Got UserTransaction interface
Transaction begun...
This event is outstanding:5
---BEFORE UPDATE-
event_id = 5
creation_date = 2001-05-23 15:45:59.35
start_after_date = 2001-05-23 15:45:59.35
update_date = 2001-05-24 15:19:27.731
completion_date = null
event_priority = 50
event_type = CatalogItemEvent
status = ERROR
status_detail =
---AFTER UPDATE-
event_id = 5
creation_date = 2001-05-23 15:45:59.35
start_after_date = 2001-05-23 15:45:59.35
update_date = 2001-05-24 15:19:27.731
completion_date = null
event_priority = 50
Re: [JBoss-dev] UserTransaction does't commit?
Oops On 2001.05.24 16:48:56 -0400 David Jencks wrote: Hi, I'm not sure why what you are doing doesn't work, but even more I don't understand why you are trying to manage the transactions yourself. I would expect the code you show to be in a session bean. From a bean, you can call setRollbackOnly() on the EJBContext to force the cmt to be rolled back when the container decides it's over. Is there some reason this won't work for you? oops If this is inside another transaction you can put the code in a separate method with RequiresNew transaction attribute./oops this would have to be in a separate bean, too, to avoid reentry problems. Sorry for this confusion. Do you have several transactions going on like this? david jencks On 2001.05.24 15:30:07 -0400 David Esposito wrote: Howdy people ... I have been building a client application that needs to manipulate snip ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] UserTransaction does't commit?
Hi,
I still don't know why it doesn't work, but here is a reason to use a
session bean:\
the most time consuming part of ejb's except for db access is serialization
going to and from the container. You have I think 6 calls, which would be
reduced to one by using a session bean.
david jencks
On 2001.05.24 17:10:08 -0400 David Esposito wrote:
There is only one reason that I can think of off the top of my head to
not
stick it into a session bean: it does a lot of file i/o client-side which
is
tied to updating two database tables ... i could probably get the records
from the DB, outside of a transaction, do my file i/o, then call a
session
bean to do the update but that adds a level of complexity that i'd prefer
not to have to deal with ...
Why is the UserTransaction exposed in the first place if it's not
supposed
to get used? ;)
-Dave
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED]]On Behalf Of
David
Jencks
Sent: Thursday, May 24, 2001 4:49 PM
To: [EMAIL PROTECTED]
Subject: Re: [JBoss-dev] UserTransaction does't commit?
Hi,
I'm not sure why what you are doing doesn't work, but even more I don't
understand why you are trying to manage the transactions
yourself. I would
expect the code you show to be in a session bean. From a bean, you can
call setRollbackOnly() on the EJBContext to force the cmt to be
rolled back
when the container decides it's over. Is there some reason this
won't work
for you? If this is inside another transaction you can put the
code in a
separate method with RequiresNew transaction attribute.
david jencks
On 2001.05.24 15:30:07 -0400 David Esposito wrote:
Howdy people ...
I have been building a client application that needs to manipulate
several
tables through CMP Entity beans ... I read the post on 4/29 about
UserTransaction getting added to the JBOSS source. I downloaded
yesterday's
snapshot of JBOSS (jboss-cvs.zip (5-23-01)) and took a crack at it ..
I am using:
Sun JDK 1.3
PostGreSQL 7.1
Windows 2000 Server
my CMP Entity Bean has a Required transaction attribute
Here's the summary of my problem: After issuing the commit() on the
transaction object, my changes are gone forever..
My usage of UserTransaction is simple ... I start a transaction with
begin()
... then i go to the home interface and use a finder to get a bunch
of
objects ... I grab the first object in the enumeration, do some
hullabaloo
with it, then do a setRecord (it just a shortcut to set all of the
bean's
fields) .. then i issue a commit() ... i've trimmed out some stuff to
make
the following readable. The name of my bean is Event ...
(yah, probably
a
bad name, but whatever... ;)) ...
try{
initialContext = new InitialContext(env);
log(Got initial context...);
eventHome =
(EventHome)getHome(initialContext,myblah/Event,EventHome.class);
log(Got EventHome interface...);
trans =
(UserTransaction)getHome(initialContext,UserTransaction,UserTran
saction.cl
ass);
log(Got UserTransaction interface);
}
catch(NamingException e){
log(NamingException during run() method initialization! +
e);
return;
}
Event event = null;
int eventNumber = 0;
while(event != null || eventNumber++ == 0)
{
//We need to begin the transaction here ... if we don't, then
the
//call to findByStatus...() is considered part of a different
transaction
//and is not encapsulated ...
try{ //Transaction block
trans.begin();
log(Transaction begun...);
//Let's try to find an event
try{
Enumeration eventList =
eventHome.findByStatusOrderByPriority(EventRecord.STATUS_NEW);
//Reset the event
event = null;
//Grab the highest priority event out of the
Enumeration
if(eventList != null eventList.hasMoreElements())
event = (Event)eventList.nextElement();
}
catch(FinderException fe){;}
catch(RemoteException re){
log(RemoteException while trying to get list
of
pending events! + re);
}
//If an event was found, handle it
if(event != null)
{
EventRecord eventRec = event.getRecord();
log(This event is outstanding: +
eventRec.event_id);
//log(eventRec.toString());
//Biz logic here
eventRec.update_date = new
Timestamp(System.currentTimeMillis());
if(EventRecord.STATUS_COMPLETE.equals(eventRec.status))
eventRec.completion_date =
eventRec.update_date;
[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
User: starksm
Date: 01/05/24 18:03:49
Modified:src/main/org/jboss Main.java
Log:
The JAAS login config file URL should be determined by querying the
class loader for confName/auth.conf, not from the jboss.properties file.
Revision ChangesPath
1.33 +17 -1 jboss/src/main/org/jboss/Main.java
Index: Main.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Main.java 2001/04/14 22:14:14 1.32
+++ Main.java 2001/05/25 01:03:49 1.33
@@ -31,7 +31,8 @@
* @see related
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author a href=mailto:[EMAIL PROTECTED];Daniel O'Connor/a.
- * @version $Revision: 1.32 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.33 $
*/
public class Main
{
@@ -79,6 +80,21 @@
System.setProperty(jboss.home, homeDir.getCanonicalPath());
}
System.out.println(jboss.home = +System.getProperty(jboss.home));
+
+ // Set the JAAS login config file if not already set
+ if( System.getProperty(java.security.auth.login.config) == null )
+ {
+ URL loginConfig =
Main.class.getClassLoader().getResource(confName+/auth.conf);
+ if( loginConfig != null )
+ {
+ System.getProperty(java.security.auth.login.config,
loginConfig.toExternalForm());
+ System.out.println(Using JAAS LoginConfig:
+loginConfig.toExternalForm());
+ }
+ else
+ {
+ System.out.println(Warning: no auth.conf found in config=+confName);
+ }
+ }
// Set security
URL serverPolicy =
Main.class.getClassLoader().getResource(confName+/server.policy);
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/etc/conf/default jboss.properties
User: starksm Date: 01/05/24 18:05:50 Modified:src/etc/conf/default Tag: Branch_2_2 jboss.properties Log: The JAAS login config file URL should be determined by querying the class loader for confName/auth.conf, not from the jboss.properties file. Fix some NPEs in the login modules Revision ChangesPath No revision No revision 1.5.2.1 +1 -3 jboss/src/etc/conf/default/jboss.properties Index: jboss.properties === RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/jboss.properties,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- jboss.properties 2001/01/25 10:43:07 1.5 +++ jboss.properties 2001/05/25 01:05:50 1.5.2.1 @@ -10,7 +10,5 @@ #java.security.manager=java.lang.SecurityManager -java.security.auth.login.config==file:../conf/default/auth.conf - # Tomcat session Id generation. Uncomment to make Tomcat initial request faster -# tomcat.sessionid.randomclass=java.util.Random \ No newline at end of file +# tomcat.sessionid.randomclass=java.util.Random ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
User: starksm
Date: 01/05/24 18:05:50
Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
Log:
The JAAS login config file URL should be determined by querying the
class loader for confName/auth.conf, not from the jboss.properties file.
Fix some NPEs in the login modules
Revision ChangesPath
No revision
No revision
1.30.2.5 +16 -2 jboss/src/main/org/jboss/Main.java
Index: Main.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.5
diff -u -r1.30.2.4 -r1.30.2.5
--- Main.java 2001/05/24 18:10:31 1.30.2.4
+++ Main.java 2001/05/25 01:05:50 1.30.2.5
@@ -32,7 +32,7 @@
* @see related
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author a href=mailto:[EMAIL PROTECTED];Daniel O'Connor/a.
- * @version $Revision: 1.30.2.4 $
+ * @version $Revision: 1.30.2.5 $
*/
public class Main
{
@@ -81,9 +81,23 @@
}
System.out.println(jboss.home = +System.getProperty(jboss.home));
+ // Set the JAAS login config file if not already set
+ if( System.getProperty(java.security.auth.login.config) == null )
+ {
+ URL loginConfig =
Main.class.getClassLoader().getResource(confName+/auth.conf);
+ if( loginConfig != null )
+ {
+ System.getProperty(java.security.auth.login.config,
loginConfig.toExternalForm());
+ System.out.println(Using JAAS LoginConfig:
+loginConfig.toExternalForm());
+ }
+ else
+ {
+ System.out.println(Warning: no auth.conf found in config=+confName);
+ }
+ }
+
// Set security
URL serverPolicy =
Main.class.getClassLoader().getResource(confName+/server.policy);
-
if ( serverPolicy == null )
{
throw new IOException(server.policy missing);
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/client jbosssx-client.jar
User: starksm Date: 01/05/24 18:05:50 Modified:src/client Tag: Branch_2_2 jbosssx-client.jar Log: The JAAS login config file URL should be determined by querying the class loader for confName/auth.conf, not from the jboss.properties file. Fix some NPEs in the login modules Revision ChangesPath No revision No revision 1.2.2.5 +9 -7 jboss/src/client/jbosssx-client.jar Binary file ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
User: starksm
Date: 01/05/24 18:41:35
Modified:src/main/org/jboss Main.java
Log:
Fix typo on setting of auth.conf property
Revision ChangesPath
1.34 +2 -2 jboss/src/main/org/jboss/Main.java
Index: Main.java
===
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Main.java 2001/05/25 01:03:49 1.33
+++ Main.java 2001/05/25 01:41:34 1.34
@@ -32,7 +32,7 @@
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author a href=mailto:[EMAIL PROTECTED];Daniel O'Connor/a.
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.33 $
+ * @version $Revision: 1.34 $
*/
public class Main
{
@@ -87,7 +87,7 @@
URL loginConfig =
Main.class.getClassLoader().getResource(confName+/auth.conf);
if( loginConfig != null )
{
- System.getProperty(java.security.auth.login.config,
loginConfig.toExternalForm());
+ System.setProperty(java.security.auth.login.config,
loginConfig.toExternalForm());
System.out.println(Using JAAS LoginConfig:
+loginConfig.toExternalForm());
}
else
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbossmq/src/main/org/jbossmq/filepersistence TxLog.java
User: pkendall
Date: 01/05/24 20:26:31
Modified:src/main/org/jbossmq/filepersistence TxLog.java
Log:
tidy up and sync the file after changes.
Revision ChangesPath
1.2 +45 -41jbossmq/src/main/org/jbossmq/filepersistence/TxLog.java
Index: TxLog.java
===
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/filepersistence/TxLog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TxLog.java2001/05/15 07:18:01 1.1
+++ TxLog.java2001/05/25 03:26:31 1.2
@@ -19,7 +19,7 @@
* It is used to rollback transactions when the system restarts.
*
* @author: Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class TxLog {
@@ -27,7 +27,7 @@
// Attributes
/
private RandomAccessFile transactionLog;
- private TreeSet transactions = new TreeSet();
+ private TreeSet transactions = new TreeSet();
private long nextTransactionId = Long.MIN_VALUE;
/
@@ -54,29 +54,31 @@
synchronized public Long createTx() throws JMSException {
Long id = new Long(nextTransactionId++);
-transactions.add(id);
+ transactions.add(id);
try {
- transactionLog.writeLong(nextTransactionId);
- transactionLog.writeInt(transactions.size());
- for(Iterator iter = transactions.iterator() ; iter.hasNext() ;) {
-transactionLog.writeLong(((Long)iter.next()).longValue());
- }
- transactionLog.seek(0);
+ transactionLog.writeLong(nextTransactionId);
+ transactionLog.writeInt(transactions.size());
+ for(Iterator iter = transactions.iterator() ; iter.hasNext()
;) {
+
transactionLog.writeLong(((Long)iter.next()).longValue());
+ }
+ transactionLog.seek(0);
+ transactionLog.getFD().sync();
} catch ( IOException e ) {
throwJMSException(Could not write transaction log on
commit.,e);
}
-return id;
+ return id;
}
synchronized public void commitTx(Long txId) throws JMSException {
try {
- transactions.remove(txId);
- transactionLog.writeLong(nextTransactionId);
- transactionLog.writeInt(transactions.size());
- for(Iterator iter = transactions.iterator() ; iter.hasNext() ;) {
-transactionLog.writeLong(((Long)iter.next()).longValue());
- }
- transactionLog.seek(0);
+ transactions.remove(txId);
+ transactionLog.writeLong(nextTransactionId);
+ transactionLog.writeInt(transactions.size());
+ for(Iterator iter = transactions.iterator() ; iter.hasNext()
;) {
+
transactionLog.writeLong(((Long)iter.next()).longValue());
+ }
+ transactionLog.seek(0);
+ transactionLog.getFD().sync();
} catch ( IOException e ) {
throwJMSException(Could not write transaction log on
commit.,e);
}
@@ -84,13 +86,14 @@
synchronized public void rollbackTx(Long txId) throws JMSException {
try {
- transactions.remove(txId);
- transactionLog.writeLong(nextTransactionId);
- transactionLog.writeInt(transactions.size());
- for(Iterator iter = transactions.iterator() ; iter.hasNext() ;) {
-transactionLog.writeLong(((Long)iter.next()).longValue());
- }
- transactionLog.seek(0);
+ transactions.remove(txId);
+ transactionLog.writeLong(nextTransactionId);
+ transactionLog.writeInt(transactions.size());
+ for(Iterator iter = transactions.iterator() ; iter.hasNext()
;) {
+
transactionLog.writeLong(((Long)iter.next()).longValue());
+ }
+ transactionLog.seek(0);
+ transactionLog.getFD().sync();
} catch ( IOException e ) {
throwJMSException(Could not write transaction log on
rollback.,e);
}
@@ -99,23 +102,24 @@
synchronized public java.util.TreeSet restore() throws JMSException {
java.util.TreeSet items=null;
-try {
- if( transactionLog.length() != 0 ) {
-nextTransactionId = transactionLog.readLong();
-int size = transactionLog.readInt();
-
[JBoss-dev] jboss daily test failed
= ==THIS IS AN AUTOMATED EMAIL - SEE http://www.lubega.com FOR DETAILS= = Buildfile: run_tests.xml build: prepare: compile: jar: prepare: bank-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 3 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/banktest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/bank.jar prepare: hello-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/hellotest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/hello.jar prepare: idgen-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/idgentest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/idgen.jar prepare: cts-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/ctstest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/cts.jar prepare: perf-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 1 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/perftest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/perf.jar prepare: bench-subproject: compile: ear: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 3 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/bench/bench.jar [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 4 files to /home/lubega/jbossro/jbosstest/build/web [copy] Copying 11 files to /home/lubega/jbossro/jbosstest/build/web/WEB-INF/classes/org/jboss/test/bench/servlet [jar] Building jar: /home/lubega/jbossro/jbosstest/build/bench/bench.war [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/bench.ear prepare: testbean-subproject: compile: jar: [copy] Copying 1 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/testbean.jar [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 3 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/testbean2.jar prepare: dbtest-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/dbtest.jar prepare: lock-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 1 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/locktest.jar prepare: load-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF prepare: xa-subproject: compile: jar: [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/xatest.jar prepare: bmp-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/bmptest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/bmp.jar prepare: mdb-subproject: compile: jar: [delete] Deleting directory /home/lubega/jbossro/jbosstest/build/classes/META-INF [copy] Copying 2 files to /home/lubega/jbossro/jbosstest/build/classes [jar] Building jar: /home/lubega/jbossro/jbosstest/build/lib/mdbtest.jar [jar] Building jar: /home/lubega/jbossro/jbosstest/build/deploy/mdb.jar prepare: spydermq-subproject: compile: jar: [jar] Building jar:
Re: [JBoss-dev] Replacing JBossMQ
Yes, that jboss/src/main/org/jboss/jms/jndi/JBossMQProvider.java is so that JBossMQ can deliver messages to the MDBs. But if you wish to use SonicMQ from your EJBs that way that it is documented in the EJB 2.0 spec, then you ne to write a resource adapter for SonicMQ also. Take a look at the org.jboss.jms.ra package in jboss. I think it might be generic enough to work with sonic.. Let us know if it works, Regards, Hiram - Original Message - From: Christian Riege [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, May 23, 2001 11:48 AM Subject: [JBoss-dev] Replacing JBossMQ hi everybody, I need to access SonicMQ from my EJB's and I also need to use it for delivering messages to my Message Driven Beans (project w/ a client who is already using SonicMQ for his internal messaging). Looking at the source of JBoss (CVS HEAD checkout) I *guess* that I have to write something along the lines of jboss/src/main/org/jboss/jms/jndi/JBossMQProvider.java i.e. a SonicMQProvider.java where I access the JNDI provided from SonicMQ and then place this SonicMQProvider into jboss.jcml replacing the standard JBossMQProvider. Is this the correct approach or am I missing something here? Best regards, Christian -- Riege Software International GmbH Phone: +49 (2159) 91 48 - 0 Mollsfeld 10 Fax : +49 (2159) 91 48 - 11 40670 Meerbusch, Germany http://www.riege.com/ ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
