Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Max R. A. <man...@jb...> - 2006-07-10 11:55:29
|
User: mandersen
Date: 06/07/10 07:55:15
Added: hibernatetools/plugins/org.hibernate.eclipse.updatesite/.settings
.cvsignore
Log:
.cvsignores
Revision Changes Path
1.1 date: 2006/07/10 11:55:15; author: mandersen; state: Exp;jbosside/hibernatetools/plugins/org.hibernate.eclipse.updatesite/.settings/.cvsignore
Index: .cvsignore
===================================================================
org.eclipse.wst.validation.prefs
|
|
From: Max R. A. <man...@jb...> - 2006-07-10 11:55:29
|
User: mandersen
Date: 06/07/10 07:55:18
Added: hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings
.cvsignore
Log:
.cvsignores
Revision Changes Path
1.1 date: 2006/07/10 11:55:18; author: mandersen; state: Exp;jbosside/hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings/.cvsignore
Index: .cvsignore
===================================================================
org.eclipse.wst.validation.prefs
|
|
From: Max R. A. <man...@jb...> - 2006-07-10 11:55:29
|
User: mandersen Date: 06/07/10 07:55:06 Log: Directory /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.help/.settings added to the repository |
|
From: Max R. A. <man...@jb...> - 2006-07-10 11:55:29
|
User: mandersen
Date: 06/07/10 07:55:16
Added: hibernatetools/plugins/org.hibernate.eclipse.help/.settings
.cvsignore
Log:
.cvsignores
Revision Changes Path
1.1 date: 2006/07/10 11:55:16; author: mandersen; state: Exp;jbosside/hibernatetools/plugins/org.hibernate.eclipse.help/.settings/.cvsignore
Index: .cvsignore
===================================================================
org.eclipse.wst.validation.prefs
|
|
From: Max R. A. <man...@jb...> - 2006-07-10 11:24:45
|
User: mandersen
Date: 06/07/10 07:24:40
Modified: hibernatetools/plugins/org.hibernate.eclipse.console/META-INF
MANIFEST.MF
Log:
HBX-702 jdk 1.5 dependency
Revision Changes Path
1.27 +1 -2 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- MANIFEST.MF 21 Jun 2006 23:17:31 -0000 1.26
+++ MANIFEST.MF 10 Jul 2006 11:24:40 -0000 1.27
@@ -60,6 +60,5 @@
org.eclipse.ui.forms,
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.common.project.facet.ui,
- org.eclipse.ui.navigator,
- org.eclipse.jdt.apt.core
+ org.eclipse.ui.navigator
Eclipse-LazyStart: true
|
|
From: Alex L. <al...@jb...> - 2006-07-10 11:03:18
|
User: aloubyansky Date: 06/07/10 07:03:12 Modified: jboss/jbossxb/snapshot/lib jboss-xml-binding.jar Log: includes JBXB-74 reinstate the unmarshal methods with the DocumentBinding parameter Revision Changes Path 1.18 +264 -259 repository.jboss.com/jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar <<Binary file>> |
|
From: Julien V. <ju...@jb...> - 2006-07-10 10:30:33
|
User: julien
Date: 06/07/10 06:30:25
Modified: wsrp/src/main/org/jboss/portal/wsrp/services
AbstractSOAPServiceFactory.java
Log:
added comments
Revision Changes Path
1.2 +8 -4 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractSOAPServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractSOAPServiceFactory.java 10 Jul 2006 10:26:51 -0000 1.1
+++ AbstractSOAPServiceFactory.java 10 Jul 2006 10:30:25 -0000 1.2
@@ -28,8 +28,11 @@
import javax.xml.rpc.Service;
/**
+ * Perform common logic to soap based service factories. This one cache the service
+ * retrieved from the JNDI lookup.
+ *
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AbstractSOAPServiceFactory extends AbstractJNDIServiceFactory
{
@@ -54,7 +57,8 @@
}
/**
- * Retrieve the sub from the service
+ * Retrieve the stub from the service. The stub is not thread safe and must be customized
+ * for each thead.
*
* @param serviceClass the requested service class
* @param service the service implementation obtained from the JNDI lookup
@@ -73,7 +77,7 @@
//
String key = serviceClass.getName();
- //
+ // Get the cached service, it's ok because they are thread safe
Service service = (Service)services.get(key);
if (service == null)
{
@@ -86,7 +90,8 @@
}
}
- //
+ // Get the stub from the service, remember that the stub itself is not threasafe
+ // and must be customized for every request to this method.
if (service != null)
{
return getStubFromService(serviceClass, service);
@@ -96,5 +101,4 @@
return null;
}
}
-
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-10 10:26:58
|
User: julien
Date: 06/07/10 06:26:51
Modified: wsrp/src/main/org/jboss/portal/wsrp/services
AbstractJNDIServiceFactory.java
PerEndpointSOAPInvokerServiceFactory.java
SOAPInvokerServiceFactory.java
Added: wsrp/src/main/org/jboss/portal/wsrp/services
AbstractSOAPServiceFactory.java
Log:
- introduced AbstractSOAPServiceFactory which performs lookup and caching of soap rcp service
- removed caching from the AbstractJNDIServiceFactory
- let subclasses of AbstractSOAPServiceFactory customize the stub obtained from the service
Revision Changes Path
1.2 +26 -65 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractJNDIServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractJNDIServiceFactory.java 7 Jul 2006 20:02:58 -0000 1.1
+++ AbstractJNDIServiceFactory.java 10 Jul 2006 10:26:51 -0000 1.2
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @noinspection ALL
* @since 2.4
*/
@@ -55,9 +55,6 @@
/** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */
protected Properties portJNDIMapping;
- /** Cache the services. */
- private Map services;
-
protected void createService() throws Exception
{
for (Iterator i = env.entrySet().iterator(); i.hasNext();)
@@ -67,14 +64,6 @@
String value = (String)entry.getValue();
log.debug("Use env property " + name + "=" + value);
}
-
- //
- services = new ConcurrentReaderHashMap();
- }
-
- protected void destroyService() throws Exception
- {
- services = null;
}
public Properties getEnv()
@@ -87,20 +76,6 @@
this.env = env;
}
- /**
- * Give a chance to subclass to customize the service between the retrieval and the caching. The default
- * implementation returns the passed service.
- *
- * @param serviceClass the requested service class
- * @param service the service implementation obtained from the JNDI lookup
- * @return an implementation based on the provided service
- * @throws Exception
- */
- protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
- {
- return service;
- }
-
public Object getService(Class serviceClass) throws Exception
{
if (serviceClass == null)
@@ -115,11 +90,6 @@
throw new IllegalArgumentException("Unknown service class: " + key);
}
- //
- Object service = services.get(key);
- if (service == null)
- {
- //
String jndiName = (String)portJNDIMapping.get(key);
log.debug("Looking up service for class " + key + " using JNDI name " + jndiName);
if (jndiName == null)
@@ -141,18 +111,13 @@
}
//
- service = ctx.lookup(jndiName);
+ Object service = ctx.lookup(jndiName);
if (log.isTraceEnabled())
{
log.trace("JNDI lookup for " + jndiName + " returned " + service);
}
//
- if (service != null)
- {
- service = customizeServiceImplementation(serviceClass, service);
- services.put(key, service);
- }
return service;
}
finally
@@ -161,10 +126,6 @@
}
}
- //
- return service;
- }
-
public Properties getPortJNDIMapping()
{
return portJNDIMapping;
1.6 +7 -10 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PerEndpointSOAPInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PerEndpointSOAPInvokerServiceFactory.java 7 Jul 2006 20:02:58 -0000 1.5
+++ PerEndpointSOAPInvokerServiceFactory.java 10 Jul 2006 10:26:51 -0000 1.6
@@ -32,10 +32,10 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
* @since 2.4
*/
-public class PerEndpointSOAPInvokerServiceFactory extends AbstractJNDIServiceFactory
+public class PerEndpointSOAPInvokerServiceFactory extends AbstractSOAPServiceFactory
{
/** . */
@@ -96,13 +96,10 @@
/**
* If retrieve object is of javax.xml.rpc.Service class, we're using the WS stack and we need to get the port.
*/
- protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
+ protected Object getStubFromService(Class serviceClass, Service service) throws Exception
{
- Service rpcService = (Service)service;
-
- //
- log.debug("Unwrapping service " + rpcService + " for class " + serviceClass);
- Object port = rpcService.getPort(serviceClass);
+ log.debug("Unwrapping service " + service + " for class " + serviceClass);
+ Object stub = service.getPort(serviceClass);
//
String portAddress = null;
@@ -127,7 +124,7 @@
if (portAddress != null)
{
log.debug("Setting the end point to: " + portAddress);
- ((Stub)port)._setProperty(PerEndpointSOAPInvokerServiceFactory.ENDPOINT_ADDRESS_PROP, portAddress);
+ ((Stub)stub)._setProperty(PerEndpointSOAPInvokerServiceFactory.ENDPOINT_ADDRESS_PROP, portAddress);
}
else
{
@@ -136,6 +133,6 @@
}
//
- return port;
+ return stub;
}
}
1.4 +7 -10 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SOAPInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SOAPInvokerServiceFactory.java 7 Jul 2006 20:02:58 -0000 1.3
+++ SOAPInvokerServiceFactory.java 10 Jul 2006 10:26:51 -0000 1.4
@@ -35,10 +35,10 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @since 2.4
*/
-public class SOAPInvokerServiceFactory extends AbstractJNDIServiceFactory
+public class SOAPInvokerServiceFactory extends AbstractSOAPServiceFactory
{
/** . */
@@ -71,21 +71,18 @@
/**
* If retrieve object is of javax.xml.rpc.Service class, we're using the WS stack and we need to get the port.
*/
- protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
+ protected Object getStubFromService(Class serviceClass, Service service) throws Exception
{
- Service rpcService = (Service)service;
-
- //
- log.debug("Unwrapping service " + rpcService + " for class " + serviceClass);
- Object port = rpcService.getPort(serviceClass);
+ log.debug("Unwrapping service " + service + " for class " + serviceClass);
+ Object stub = service.getPort(serviceClass);
//
if (endpointURL != null)
{
String portAddress = endpointURL + PORT_NAMES.get(serviceClass);
log.debug("Setting the end point to: " + portAddress);
- ((Stub)port)._setProperty(ENDPOINT_ADDRESS_PROP, portAddress);
+ ((Stub)stub)._setProperty(ENDPOINT_ADDRESS_PROP, portAddress);
}
- return port;
+ return stub;
}
}
1.1 date: 2006/07/10 10:26:51; author: julien; state: Exp;jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java
Index: AbstractSOAPServiceFactory.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.portal.wsrp.services;
import java.util.Map;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import javax.xml.rpc.Service;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractSOAPServiceFactory extends AbstractJNDIServiceFactory
{
/** Cache the services. */
private Map services;
protected void createService() throws Exception
{
super.createService();
//
services = new ConcurrentReaderHashMap();
}
protected void destroyService() throws Exception
{
services = null;
//
super.destroyService();
}
/**
* Retrieve the sub from the service
*
* @param serviceClass the requested service class
* @param service the service implementation obtained from the JNDI lookup
* @return an implementation based on the provided service
* @throws Exception
*/
protected abstract Object getStubFromService(Class serviceClass, Service service) throws Exception;
public Object getService(Class serviceClass) throws Exception
{
if (serviceClass == null)
{
throw new IllegalArgumentException("Null class not accepted to perform lookup");
}
//
String key = serviceClass.getName();
//
Service service = (Service)services.get(key);
if (service == null)
{
service = (Service)super.getService(serviceClass);
//
if (service != null)
{
services.put(key, service);
}
}
//
if (service != null)
{
return getStubFromService(serviceClass, service);
}
else
{
return null;
}
}
}
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 06:37:17
|
User: j2ee_junkie
Date: 06/07/10 02:37:05
Modified: src/main/org/jboss/security Tag: Branch_4_0
AltClientLoginModule.java ClientLoginModule.java
Added: src/main/org/jboss/security Tag: Branch_4_0
SecurityConstants.java
Log:
JBAS-1477: Pass in the security-domain name to the login modules for error reporting
Revision Changes Path
No revision
No revision
1.4.4.2 +25 -8 jbosssx/src/main/org/jboss/security/AltClientLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AltClientLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -b -r1.4.4.1 -r1.4.4.2
--- AltClientLoginModule.java 29 Oct 2005 05:06:37 -0000 1.4.4.1
+++ AltClientLoginModule.java 10 Jul 2006 06:37:05 -0000 1.4.4.2
@@ -34,6 +34,9 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityConstants;
+
/** A simple implementation of LoginModule for use by JBoss clients for
the establishment of the caller identity and credentials. This simply sets
the SecurityAssociation principal to the value of the NameCallback
@@ -57,10 +60,11 @@
</ul>
@author Sco...@jb...
- @version $Revision: 1.4.4.1 $
+ @version $Revision: 1.4.4.2 $
*/
public class AltClientLoginModule implements LoginModule
{
+ private static Logger log = Logger.getLogger(AltClientLoginModule.class);
private Subject subject;
private CallbackHandler callbackHandler;
/** Shared state between login modules */
@@ -69,6 +73,7 @@
private boolean useFirstPass;
private String username;
private char[] password = null;
+ private boolean trace;
/**
* Initialize this LoginModule.
@@ -76,15 +81,25 @@
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map sharedState, Map options)
{
+ this.trace = log.isTraceEnabled();
this.subject = subject;
this.callbackHandler = callbackHandler;
this.sharedState = sharedState;
+
+ //log securityDomain, if set.
+ if(trace)
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+
// Check for multi-threaded option
String mt = (String) options.get("multi-threaded");
- if( mt != null && Boolean.valueOf(mt).booleanValue() == true )
- { /* Turn on the server mode which uses thread local storage for
+ if( Boolean.valueOf(mt).booleanValue() == true )
+ {
+ /* Turn on the server mode which uses thread local storage for
the principal information.
*/
+ if(trace)
+ log.trace("Enabling multi-threaded mode");
SecurityAssociationActions.setServer();
}
@@ -94,6 +109,8 @@
*/
String passwordStacking = (String) options.get("password-stacking");
useFirstPass = passwordStacking != null;
+ if(trace && useFirstPass)
+ log.trace("Enabling useFirstPass mode");
}
/**
1.7.4.4 +15 -4 jbosssx/src/main/org/jboss/security/ClientLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClientLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/ClientLoginModule.java,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -u -b -r1.7.4.3 -r1.7.4.4
--- ClientLoginModule.java 19 Feb 2006 02:25:38 -0000 1.7.4.3
+++ ClientLoginModule.java 10 Jul 2006 06:37:05 -0000 1.7.4.4
@@ -21,7 +21,6 @@
*/
package org.jboss.security;
-
import java.io.IOException;
import java.security.Principal;
import java.util.Map;
@@ -36,6 +35,7 @@
import javax.security.auth.spi.LoginModule;
import org.jboss.logging.Logger;
+import org.jboss.security.SecurityConstants;
/** A simple implementation of LoginModule for use by JBoss clients for
the establishment of the caller identity and credentials. This simply sets
@@ -97,19 +97,28 @@
this.subject = subject;
this.callbackHandler = callbackHandler;
this.sharedState = sharedState;
+
+ //log securityDomain, if set.
+ if(trace)
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+
// Check for multi-threaded option
String flag = (String) options.get("multi-threaded");
if (Boolean.valueOf(flag).booleanValue() == true)
- { /* Turn on the server mode which uses thread local storage for
+ {
+ /* Turn on the server mode which uses thread local storage for
the principal information.
*/
- if( trace )
+ if(trace)
log.trace("Enabling multi-threaded mode");
SecurityAssociationActions.setServer();
}
flag = (String) options.get("restore-login-identity");
restoreLoginIdentity = Boolean.valueOf(flag).booleanValue();
+ if(trace)
+ log.trace("Enabling restore-login-identity mode");
/* Check for password sharing options. Any non-null value for
password_stacking sets useFirstPass as this module has no way to
@@ -117,6 +126,8 @@
*/
String passwordStacking = (String) options.get("password-stacking");
useFirstPass = passwordStacking != null;
+ if(trace && useFirstPass)
+ log.trace("Enabling useFirstPass mode");
}
/**
No revision
No revision
1.3.2.2 +39 -0 jbosssx/src/main/org/jboss/security/SecurityConstants.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityConstants.java
===================================================================
RCS file: SecurityConstants.java
diff -N SecurityConstants.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SecurityConstants.java 10 Jul 2006 06:37:05 -0000 1.3.2.2
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security;
+
+//$Id: SecurityConstants.java,v 1.3.2.2 2006/07/10 06:37:05 j2ee_junkie Exp $
+
+/**
+ * Defines Constants for usage in the Security Layer
+ * @author <a href="mailto:Ani...@jb...">Anil Saldhana</a>
+ * @since Dec 30, 2005
+ * @version $Revision: 1.3.2.2 $
+ */
+public interface SecurityConstants
+{
+ /**
+ * The String option name used to pass in the security-domain
+ * name the LoginModule was configured in.
+ */
+ String SECURITY_DOMAIN_OPTION = "jboss.security.security_domain";
+}
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 06:37:16
|
User: j2ee_junkie
Date: 06/07/10 02:37:05
Modified: src/main/org/jboss/security/auth/login Tag: Branch_4_0
AuthenticationInfo.java
Log:
JBAS-1477: Pass in the security-domain name to the login modules for error reporting
Revision Changes Path
No revision
No revision
1.2.26.4 +9 -4 jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationInfo.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java,v
retrieving revision 1.2.26.3
retrieving revision 1.2.26.4
diff -u -b -r1.2.26.3 -r1.2.26.4
--- AuthenticationInfo.java 29 Oct 2005 05:06:34 -0000 1.2.26.3
+++ AuthenticationInfo.java 10 Jul 2006 06:37:05 -0000 1.2.26.4
@@ -21,19 +21,22 @@
*/
package org.jboss.security.auth.login;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Map.Entry;
import javax.security.auth.AuthPermission;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.AppConfigurationEntry;
+import org.jboss.security.SecurityConstants;
+
/** The login module configuration information.
@author Sco...@jb...
- @version $Revision: 1.2.26.3 $
+ @version $Revision: 1.2.26.4 $
*/
public class AuthenticationInfo
{
@@ -69,8 +72,10 @@
for(int i = 0; i < copy.length; i ++)
{
AppConfigurationEntry entry = (AppConfigurationEntry) loginModules.get(i);
+ HashMap options = new HashMap(entry.getOptions());
+ options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
copy[i] = new AppConfigurationEntry(entry.getLoginModuleName(),
- entry.getControlFlag(), entry.getOptions());
+ entry.getControlFlag(), options);
}
return copy;
}
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 06:37:09
|
User: j2ee_junkie
Date: 06/07/10 02:37:05
Modified: src/main/org/jboss/security/auth/spi Tag: Branch_4_0
AbstractServerLoginModule.java
Log:
JBAS-1477: Pass in the security-domain name to the login modules for error reporting
Revision Changes Path
No revision
No revision
1.12.4.3 +8 -2 jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractServerLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -u -b -r1.12.4.2 -r1.12.4.3
--- AbstractServerLoginModule.java 29 Oct 2005 05:06:35 -0000 1.12.4.2
+++ AbstractServerLoginModule.java 10 Jul 2006 06:37:05 -0000 1.12.4.3
@@ -37,6 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.security.NestableGroup;
+import org.jboss.security.SecurityConstants;
import org.jboss.security.SimpleGroup;
import org.jboss.security.SimplePrincipal;
@@ -67,7 +68,7 @@
*
*@author <a href="edw...@cr...">Edward Kenworthy</a>, 12th Dec 2000
*@author Sco...@jb...
- *@version $Revision: 1.12.4.2 $
+ *@version $Revision: 1.12.4.3 $
*/
public abstract class AbstractServerLoginModule implements LoginModule
{
@@ -119,6 +120,11 @@
log = Logger.getLogger(getClass());
if( log.isTraceEnabled() )
log.trace("initialize, instance=@"+System.identityHashCode(this));
+
+ //log securityDomain, if set.
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+
/* Check for password sharing options. Any non-null value for
password_stacking sets useFirstPass as this module has no way to
validate any shared password.
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 05:35:11
|
User: j2ee_junkie
Date: 06/07/10 01:35:08
Modified: src/main/org/jboss/security AltClientLoginModule.java
Log:
Ooops! remove introduced spaces
Revision Changes Path
1.7 +2 -2 jbosssx/src/main/org/jboss/security/AltClientLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AltClientLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AltClientLoginModule.java 10 Jul 2006 04:42:37 -0000 1.6
+++ AltClientLoginModule.java 10 Jul 2006 05:35:08 -0000 1.7
@@ -60,7 +60,7 @@
</ul>
@author Sco...@jb...
- @version $Revision: 1.6 $
+ @version $Revision: 1.7 $
*/
public class AltClientLoginModule implements LoginModule
{
@@ -98,7 +98,7 @@
/* Turn on the server mode which uses thread local storage for
the principal information.
*/
- if( trace )
+ if(trace)
log.trace("Enabling multi-threaded mode");
SecurityAssociationActions.setServer();
}
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 05:35:11
|
User: j2ee_junkie
Date: 06/07/10 01:35:09
Modified: src/main/org/jboss/security/auth/login
AuthenticationInfo.java
Log:
Ooops! remove introduced spaces
Revision Changes Path
1.9 +2 -2 jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationInfo.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- AuthenticationInfo.java 10 Jul 2006 04:42:37 -0000 1.8
+++ AuthenticationInfo.java 10 Jul 2006 05:35:09 -0000 1.9
@@ -35,7 +35,7 @@
/** The login module configuration information.
@author Sco...@jb...
- @version $Revision: 1.8 $
+ @version $Revision: 1.9 $
*/
public class AuthenticationInfo extends BaseAuthenticationInfo
{
@@ -55,7 +55,7 @@
/** Get a copy of the application authentication configuration. This requires
an AuthPermission("getLoginConfiguration") access.
*/
- public AppConfigurationEntry[ ] copyAppConfigurationEntry()
+ public AppConfigurationEntry[] copyAppConfigurationEntry()
{
SecurityManager sm = System.getSecurityManager();
if( sm != null )
|
|
From: Aron S. <bi...@gm...> - 2006-07-10 05:28:47
|
User: asogor
Date: 06/07/10 01:28:44
Modified: src/calendar/calendarejb/src/java/org/jboss/mail/calendar/util/availability
AvailabilityCalculator.java
Log:
updates to the calculator
Revision Changes Path
1.2 +161 -98 jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/util/availability/AvailabilityCalculator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AvailabilityCalculator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/util/availability/AvailabilityCalculator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AvailabilityCalculator.java 8 Jul 2006 01:48:10 -0000 1.1
+++ AvailabilityCalculator.java 10 Jul 2006 05:28:44 -0000 1.2
@@ -10,8 +10,11 @@
import org.jboss.mail.calendar.data.CalendarEvent;
import org.jboss.mail.calendar.data.Invite;
+import com.sun.tools.javac.tree.Tree.Assert;
+
/**
- * AvailabilityCalculator is a utility to figure out possible timeslots for a meeting
+ * AvailabilityCalculator is a utility to figure out possible timeslots for a
+ * meeting
*
* @author Aron Sogor
*
@@ -23,88 +26,136 @@
* The logic of this calculator is simple:
*
* Create segments using the increment between start date and end date.
- * Check which segments are free, meaning there are no meeting during that segment.
- * Find numberOfunits continous free segments.
- * Return all event proposals.
+ * Check which segments are free, meaning there are no meeting during that
+ * segment. Find numberOfunits continous free segments. Return all event
+ * proposals.
*
- * @param invites all the attendees events
- * @param startTime the begining of the search range
- * @param endTime the end of the search range
- * @param incrementSize the size of an increment in minutes
- * @param numberOfunits the number of increments the meeting should last
+ * @param invites
+ * all the attendees events
+ * @param startTime
+ * the begining of the search range
+ * @param endTime
+ * the end of the search range
+ * @param incrementSize
+ * the size of an increment in minutes
+ * @param numberOfunits
+ * the number of increments the meeting should last
*/
- public static CalendarEvent[] calculate(Invite[] invites,Date startTime,Date endTime,int incrementSize,int numberOfunits)
- {
- return (new AvailabilityCalculator()).calculateEvents(invites,startTime,endTime,incrementSize,numberOfunits);
+ public static CalendarEvent[] calculate(Invite[] invites, Date startTime,
+ Date endTime, int incrementSize, int numberOfunits) {
+ return (new AvailabilityCalculator()).calculateEvents(invites,
+ startTime, endTime, incrementSize, numberOfunits);
}
- private CalendarEvent[] calculateEvents(Invite[] invites,Date startTime,Date endTime,int incrementSize,int numberOfunits)
- {
+ private CalendarEvent[] calculateEvents(Invite[] invites, Date startTime,
+ Date endTime, int incrementSize, int numberOfunits) {
ArrayList<CalendarEvent> result = new ArrayList<CalendarEvent>();
- if(startTime.after(endTime))
- {
- log.warn("Availibilty calculator was passed stared and end date reversed");
+ if (startTime.after(endTime)) {
+ log
+ .warn("Availibilty calculator was passed stared and end date reversed");
return new CalendarEvent[0];
}
- double segmentTotal = Math.ceil((startTime.getTime() - endTime.getTime())/(60000 * incrementSize));
-
- //generate the segments
- Segment firstSegment = setupSegments(startTime,endTime,segmentTotal);
- //mark each segment free(true) or busy(false)
- //check each segment as valid
-
- return (CalendarEvent[])result.toArray(new CalendarEvent[0]);
+ double segmentTotal = Math.ceil((startTime.getTime() - endTime
+ .getTime())
+ / (60000 * incrementSize));
+
+ // generate the segments
+ // mark each segment free or busy
+ Segment firstSegment = setupSegments(invites, startTime, endTime,
+ segmentTotal, (60000 * incrementSize));
+ // check each segment as valid
+ Segment cursor = firstSegment;
+ while (cursor!=null) {
+ if(cursor.isFree(numberOfunits))
+ {
+ CalendarEvent event = new CalendarEvent();
+ event.setStartDate(cursor.getStartTime());
+ event.setEndDate(new Date(cursor.getStartTime().getTime() + (60000 * incrementSize)));
+ result.add(event);
+ }
+ }
+ return (CalendarEvent[]) result.toArray(new CalendarEvent[0]);
}
- private Segment setupSegments(Date startTime,Date endTime,double segmentTotal)
- {
+ private Segment setupSegments(Invite[] invites, Date startTime,
+ Date endTime, double segmentTotal, int increment) {
Segment firstSegment = null;
Segment currentSegment = null;
+ // date is mutable do not want to shift starttime
+ Date segmentStart = new Date(startTime.getTime());
for (int segmentCnt = 0; segmentCnt < segmentTotal; segmentCnt++) {
- if(currentSegment == null)
- {
- currentSegment.setNextSegment(new Segment(startTime,endTime,true));
+ if (currentSegment == null) {
+ currentSegment = new Segment(new Date(segmentStart.getTime()),
+ new Date(startTime.getTime() + increment), false);
firstSegment = currentSegment;
- }
- else
- currentSegment.setNextSegment(new Segment(startTime,endTime,true));
+ } else {
+ currentSegment.setNextSegment(new Segment(new Date(segmentStart
+ .getTime()), new Date(startTime.getTime() + increment),
+ false));
currentSegment = currentSegment.getNextSegment();
}
+ evaluateSegmentFreeBusy(invites,currentSegment);
+ segmentStart.setTime(currentSegment.getEndTime().getTime());
+ }
return firstSegment;
}
- private class Segment{
+ private void evaluateSegmentFreeBusy(Invite[] invites, Segment segment) {
+ for (int i = 0; ((i < invites.length)&&(!segment.isBusy)); i++) {
+ segment.setBusy(((segment.getStartTime().getTime() <= invites[i]
+ .getEvent().getStartDate().getTime()) && (segment
+ .getEndTime().getTime() >= invites[i].getEvent()
+ .getStartDate().getTime()))
+ || ((segment.getStartTime().getTime() <= invites[i]
+ .getEvent().getEndDate().getTime()) && (segment
+ .getEndTime().getTime() >= invites[i].getEvent()
+ .getEndDate().getTime())));
+ }
+ }
+
+ private class Segment {
private Date startTime = null;
+
private Date endTime = null;
+
private boolean isBusy = false;
+
private Segment nextSegment = null;
public Date getEndTime() {
return endTime;
}
+
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
+
public boolean isBusy() {
return isBusy;
}
+
public void setBusy(boolean isBusy) {
this.isBusy = isBusy;
}
+
public Date getStartTime() {
return startTime;
}
+
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
+
public Segment getNextSegment() {
return nextSegment;
}
+
public void setNextSegment(Segment nextSegment) {
this.nextSegment = nextSegment;
}
+
public Segment(Date startTime, Date endTime, boolean isBusy) {
super();
// TODO Auto-generated constructor stub
@@ -112,5 +163,17 @@
this.endTime = endTime;
this.isBusy = isBusy;
}
+
+ public boolean isFree(int depth)
+ {
+ // busy, cut the chain
+ if(isBusy) return false;
+ // last element, must be true but if I am wrong:)
+ if(depth == 1) {assert(isBusy==true);return true;}
+ // not enough "time" at the end of the list
+ if(nextSegment == null) return false;
+ //call next
+ return nextSegment.isFree(depth--);
+ }
}
}
|
|
From: <for...@jb...> - 2006-07-10 05:00:39
|
Commit from julien (2006-07-09 08:04 EDT) ------------------ move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal jboss-portal core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java 1.15 jboss-portal core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java 1.9 jboss-portal core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java 1.61 jboss-portal core/src/main/org/jboss/portal/core/command/InvokeWindowCommand.java 1.5 jboss-portal core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java 1.38 jboss-portal core/src/main/org/jboss/portal/core/command/MarkupCommand.java 1.32 jboss-portal core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java 1.49 jboss-portal core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java 1.12 jboss-portal core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java 1.23 jboss-portal core/src/main/org/jboss/portal/core/command/portlet/CoreRenderContext.java 1.10 jboss-portal core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java 1.3 jboss-portal core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java 1.3 jboss-portal core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java 1.28 jboss-portal core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java 1.17 jboss-portal core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 1.19 jboss-portal core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java 1.5 jboss-portal core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 1.11 jboss-portal core/src/main/org/jboss/portlet/event/node/WindowEvent.java 1.6 + jboss-portal portlet/src/main/org/jboss/portal/portlet/Mode.java 1.1 jboss-portal portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/PortletURL.java 1.5 + jboss-portal portlet/src/main/org/jboss/portal/portlet/WindowState.java 1.1 jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java 1.3 jboss-portal portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java 1.3 jboss-portal portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java 1.9 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java 1.8 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java 1.7 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java 1.31 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java 1.9 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java 1.4 jboss-portal portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java 1.4 jboss-portal portlet/src/main/org/jboss/portal/portlet/result/RenderResult.java 1.9 jboss-portal portlet/src/main/org/jboss/portal/portlet/spi/InvocationContext.java 1.12 jboss-portal portlet/src/main/org/jboss/portal/portlet/support/spi/InvocationContextSupport.java 1.3 jboss-portal portlet/src/main/org/jboss/portal/portlet/test/PortletController.java 1.72 jboss-portal portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 1.6 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 1.2 jboss-portal portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java 1.7 - jboss-portal server/src/main/org/jboss/portal/Mode.java 1.7 - jboss-portal server/src/main/org/jboss/portal/WindowState.java 1.6 jboss-portal theme/src/main/org/jboss/portal/test/theme/TestHelper.java 1.17 jboss-portal theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java 1.16 jboss-portal theme/src/main/org/jboss/portal/theme/impl/render/DivWindowRenderer.java 1.15 jboss-portal theme/src/main/org/jboss/portal/theme/impl/render/EmptyWindowRenderer.java 1.10 jboss-portal theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java 1.8 jboss-portal theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java 1.3 jboss-portal theme/src/main/org/jboss/portal/theme/render/MarkupResult.java 1.9 jboss-portal theme/src/main/org/jboss/portal/theme/render/RenderContext.java 1.19 jboss-portal theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java 1.3 jboss-portal theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java 1.13 jboss-portal theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java 1.8 jboss-portal wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 1.16 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/WSRPActionURL.java 1.4 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 1.13 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/WSRPRenderURL.java 1.4 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/WSRPResourceURL.java 1.2 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 1.20 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java 1.19 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 1.13 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPActionContext.java 1.10 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPInvocationContext.java 1.25 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRenderContext.java 1.11 Commit from alesj (2006-07-09 09:18 EDT) ----------------- Reformat code + Spring-MC fix. jboss-spring src/main/org/jboss/annotation/spring/Spring.java 1.6 jboss-spring src/main/org/jboss/spring/callback/SpringLifecycleInterceptor.java 1.7 jboss-spring src/main/org/jboss/spring/callback/SpringPassivationInterceptor.java 1.7 jboss-spring src/main/org/jboss/spring/deployment/SpringApplicationContextDeployer.java 1.3 jboss-spring src/main/org/jboss/spring/deployment/SpringBeanFactoryDeployer.java 1.3 jboss-spring src/main/org/jboss/spring/deployment/SpringDeployer.java 1.11 jboss-spring src/main/org/jboss/spring/deployment/SpringDeployerMBean.java 1.5 jboss-spring src/main/org/jboss/spring/factory/AbstractBeanFactoryLoader.java 1.3 jboss-spring src/main/org/jboss/spring/factory/ApplicationContextLoaderImpl.java 1.3 jboss-spring src/main/org/jboss/spring/factory/BeanFactoryLoader.java 1.3 jboss-spring src/main/org/jboss/spring/factory/BeanFactoryLoaderImpl.java 1.5 jboss-spring src/main/org/jboss/spring/factory/Instantiable.java 1.3 jboss-spring src/main/org/jboss/spring/factory/Nameable.java 1.3 jboss-spring src/main/org/jboss/spring/factory/NamedXmlApplicationContext.java 1.4 jboss-spring src/main/org/jboss/spring/factory/NamedXmlBeanDefinitionParser.java 1.8 jboss-spring src/main/org/jboss/spring/factory/NamedXmlBeanDefinitionReader.java 1.6 jboss-spring src/main/org/jboss/spring/factory/NamedXmlBeanFactory.java 1.5 jboss-spring src/main/org/jboss/spring/interceptor/SpringInjectionInterceptor.java 1.5 jboss-spring src/main/org/jboss/spring/kernel/ControllerLocator.java 1.4 jboss-spring src/main/org/jboss/spring/kernel/KernelLocator.java 1.3 jboss-spring src/main/org/jboss/spring/kernel/LazyLocator.java 1.5 jboss-spring src/main/org/jboss/spring/kernel/Locator.java 1.4 jboss-spring src/main/org/jboss/spring/kernel/MapLocator.java 1.4 jboss-spring src/main/org/jboss/spring/kernel/MicrocontainerConfigurer.java 1.5 jboss-spring src/main/org/jboss/spring/kernel/MicrocontainerLoaderImpl.java 1.5 jboss-spring src/main/org/jboss/spring/kernel/MicrocontainerLocatorSupport.java 1.4 jboss-spring src/main/org/jboss/spring/kernel/NullLocator.java 1.4 jboss-spring src/main/org/jboss/spring/kernel/SpringMicrocontainerDeployer.java 1.3 jboss-spring src/main/org/jboss/spring/support/SpringInjectionSupport.java 1.6 jboss-spring src/resources/test/dd/spring/jboss-spring.xml 1.2 jboss-spring src/resources/test/docs/JBoss-Spring-Example.html 1.2 jboss-spring src/resources/test/web/WEB-INF/applicationContext.xml 1.2 jboss-spring src/resources/test/web/WEB-INF/jboss-spring-servlet.xml 1.2 jboss-spring src/resources/test/web/index.jsp 1.2 jboss-spring src/resources/jboss-service.xml 1.3 jboss-spring src/test/org/jboss/tutorial/ee/service/impl/HoroscopeBean.java 1.8 jboss-spring src/test/org/jboss/tutorial/ee/service/impl/RandomizerBean.java 1.3 jboss-spring src/test/org/jboss/tutorial/ee/service/Horoscope.java 1.3 jboss-spring src/test/org/jboss/tutorial/ee/service/Randomizer.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/DummyStateIntCreator.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/FileLineReader.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/IntCreator.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/JavaRandomIntCreator.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/RandomFileWordsCreator.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/StaticWordsCreator.java 1.3 jboss-spring src/test/org/jboss/tutorial/spring/WordsCreator.java 1.3 jboss-spring src/test/org/jboss/tutorial/web/AppController.java 1.3 thirdparty ibm/wsdl4j/component-info.xml 1.4 Commit from alesj (2006-07-09 11:54 EDT) ----------------- Spring Unit Test. + jboss-spring src/test/org/jboss/spring/test/ear/business/SessionTestBean.java 1.1 + jboss-spring src/test/org/jboss/spring/test/ear/business/SessionTestBeanImpl.java 1.1 + jboss-spring src/test/org/jboss/spring/test/ear/business/SessionTestBeanLocal.java 1.1 + jboss-spring src/test/org/jboss/spring/test/ear/business/SessionTestBeanRemote.java 1.1 + jboss-spring src/test/org/jboss/spring/test/ear/pojo/Tester.java 1.1 + jboss-spring src/test/org/jboss/spring/test/ear/unit/SpringEARUnitTestCase.java 1.1 + jboss-spring local.properties 1.1 Commit from alesj (2006-07-09 11:59 EDT) ----------------- Spring Unit Test. + jboss-spring src/resources/test/ear/business/META-INF/ejb-jar.xml 1.1 + jboss-spring src/resources/test/ear/business/META-INF/persistence.xml 1.1 + jboss-spring src/resources/test/ear/spring/META-INF/jboss-spring.xml 1.1 + jboss-spring src/resources/test/ear/application.xml 1.1 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-09 12:34 EDT) ------------------------------------------------------ Improved javadocs JBossCache src/org/jboss/cache/config/Option.java 1.6.2.1 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-09 13:16 EDT) ------------------------------------------------------ Updated documentation JBossCache docs/TreeCache/en/modules/architecture.xml 1.2.4.1 JBossCache docs/TreeCache/en/modules/basic_api.xml 1.2.4.1 JBossCache docs/TreeCache/en/modules/compatibility.xml 1.1.4.1 JBossCache docs/TreeCache/en/modules/configuration.xml 1.10.2.1 JBossCache docs/TreeCache/en/modules/eviction_policies.xml 1.3.4.1 JBossCache docs/TreeCache/en/modules/introduction.xml 1.4.4.1 JBossCache docs/TreeCache/en/modules/replication.xml 1.5.2.1 JBossCache docs/TreeCache/en/modules/transactions.xml 1.2.4.1 JBossCache docs/TreeCache/en/modules/treecache_marshaller.xml 1.3.2.1 JBossCache docs/TreeCache/en/master.xml 1.35.2.3 JBossCache docs/faq/en/master.xml 1.34.2.4 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-09 13:19 EDT) ------------------------------------------------------ Updated changelog JBossCache docs/Changelog.txt 1.20.2.3 Commit from mculpepper (2006-07-09 14:12 EDT) ---------------------- updated all build drivers to callisto jbosside releng/org.jboss.ide.eclipse.releng/requirements/gef/build.properties 1.10 jbosside releng/org.jboss.ide.eclipse.releng/requirements/webtools/build.properties 1.13 jbosside releng/org.jboss.ide.eclipse.releng/requirements/eclipse/build.properties 1.8 jbosside releng/org.jboss.ide.eclipse.releng/requirements/emf-sdo-xsd/build.properties 1.10 jbosside releng/org.jboss.ide.eclipse.releng/requirements/testframework/build.properties 1.3 jbosside releng/org.jboss.ide.eclipse.releng/requirements/jem/build.properties 1.10 Commit from mculpepper (2006-07-09 15:21 EDT) ---------------------- updated pdescriptdir jbosside releng/org.jboss.ide.eclipse.releng/builders/global.properties.template 1.11 Commit from gurkanerdogdu (2006-07-09 15:50 EDT) ------------------------- Cache Builder + jbosside releng/org.jboss.ide.eclipse.releng/builders/cache/build.properties.template 1.1 + jbosside releng/org.jboss.ide.eclipse.releng/builders/cache/customTargets.xml 1.1 + jbosside releng/org.jboss.ide.eclipse.releng/builders/cache/build.requires 1.1 + jbosside releng/org.jboss.ide.eclipse.releng/builders/cache/jbosside-cache.map 1.1 + jbosside releng/org.jboss.ide.eclipse.releng/builders/cache/build.properties 1.1 Commit from gurkanerdogdu (2006-07-09 16:08 EDT) ------------------------- *** empty log message *** + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jdbm-1.0.jar 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jboss-aop.jar 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jgroups.jar 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jboss-cache.jar 1.3 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jboss-serialization.jar 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/derby.jar 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.properties 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.xml 1.4 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/dtd/cache-configuration.dtd 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/icons/search.gif 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/icons/property_obj.gif 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/icons/prop_ps.gif 1.1 Commit from mculpepper (2006-07-09 16:15 EDT) ---------------------- removed build.properties (should be generated from the template file) - jbosside releng/org.jboss.ide.eclipse.releng/builders/cache/build.properties 1.2 Commit from gurkanerdogdu (2006-07-09 16:50 EDT) ------------------------- Java 1.4 related jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java 1.4 Commit from aloubyansky (2006-07-09 17:46 EDT) ----------------------- latest snapshot repository.jboss.com jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar 1.17 Commit from starksm on branch Branch_4_0 (2006-07-09 18:05 EDT) ---------------------------------------- JBAS-3381, build two sets of jmx domain names to server mappings to determine which server should be used to handle a given ObjectName. jboss-system src/main/org/jboss/system/server/jmx/LazyMBeanServer.java 1.1.2.5 Commit from starksm (2006-07-09 18:12 EDT) ------------------- JBAS-3381, build two sets of jmx domain names to server mappings to determine which server should be used to handle a given ObjectName. jboss-system src/main/org/jboss/system/server/jmx/LazyMBeanServer.java 1.6 Commit from starksm (2006-07-09 19:45 EDT) ------------------- Stub out the getDeployments method system2 src/main/org/jboss/system/server/profile/basic/ProfileImpl.java 1.2 Commit from starksm (2006-07-09 19:48 EDT) ------------------- Bootstrap the ProfileService implementation from the deployer-beans.xml and drop the unnecessary ServerPSBootstrap class. system2 src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 1.2 - system2 src/main/org/jboss/system/server/profileservice/ServerPSBootstrap.java 1.2 system2 src/main/org/jboss/system/server/profileservice/ServerImpl.java 1.3 system2 src/main/org/jboss/system/server/profileservice/ProfileServiceImpl.java 1.2 system2 src/resources/tests/xml/deployer-beans.xml 1.2 Commit from bwang (2006-07-09 20:48 EDT) ----------------- Needed to reverse the addObserver sequence. JBossCache src-50/org/jboss/cache/pojo/PojoUtil.java 1.5 Commit from bwang (2006-07-09 22:09 EDT) ----------------- upd JBossCache tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java 1.4 Commit from bwang (2006-07-09 22:30 EDT) ----------------- Make sure CacheFieldInterceptor and SubjectInterceptor to skip MethodInvolcation. JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/observable/SubjectInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/PojoUtil.java 1.6 Commit from bwang (2006-07-09 22:31 EDT) ----------------- Added back the 1.4 style PojoCacheable. JBossCache src/resources/jboss-aop.xml 1.10 Commit from mproctor (2006-07-09 22:43 EDT) -------------------- -upload drools 3.0.2 + repository.jboss.com maven2/org/drools/drools-core/3.0.2/drools-core-3.0.2.pom 1.1 + repository.jboss.com maven2/org/drools/drools-core/3.0.2/drools-core-3.0.2.jar 1.1 + repository.jboss.com maven2/org/drools/drools-compiler/3.0.2/drools-compiler-3.0.2.pom 1.1 + repository.jboss.com maven2/org/drools/drools-compiler/3.0.2/drools-compiler-3.0.2.jar 1.1 + repository.jboss.com maven2/org/drools/drools-jsr94/3.0.2/drools-jsr94-3.0.2.pom 1.1 + repository.jboss.com maven2/org/drools/drools-jsr94/3.0.2/drools-jsr94-3.0.2.jar 1.1 + repository.jboss.com maven2/org/drools/drools-decisiontables/3.0.2/drools-decisiontables-3.0.2.pom 1.1 + repository.jboss.com maven2/org/drools/drools-decisiontables/3.0.2/drools-decisiontables-3.0.2.jar 1.1 + repository.jboss.com maven2/org/drools/drools/3.0.2/drools-3.0.2.pom 1.1 Commit from j2ee_junkie (2006-07-10 00:42 EDT) ----------------------- JBAS-1477: Pass in the security-domain name to the login modules for error reporting jbosssx src/main/org/jboss/security/AltClientLoginModule.java 1.6 jbosssx src/main/org/jboss/security/ClientLoginModule.java 1.11 jbosssx src/main/org/jboss/security/SecurityConstants.java 1.3 jbosssx src/main/org/jboss/security/auth/login/AuthenticationInfo.java 1.8 jbosssx src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java 1.14 |
|
From: Chris G. <ce...@uf...> - 2006-07-10 04:42:48
|
User: j2ee_junkie
Date: 06/07/10 00:42:37
Modified: src/main/org/jboss/security AltClientLoginModule.java
ClientLoginModule.java SecurityConstants.java
Log:
JBAS-1477: Pass in the security-domain name to the login modules for error reporting
Revision Changes Path
1.6 +21 -4 jbosssx/src/main/org/jboss/security/AltClientLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AltClientLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AltClientLoginModule.java 30 Oct 2005 00:06:02 -0000 1.5
+++ AltClientLoginModule.java 10 Jul 2006 04:42:37 -0000 1.6
@@ -34,6 +34,9 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityConstants;
+
/** A simple implementation of LoginModule for use by JBoss clients for
the establishment of the caller identity and credentials. This simply sets
the SecurityAssociation principal to the value of the NameCallback
@@ -57,10 +60,11 @@
</ul>
@author Sco...@jb...
- @version $Revision: 1.5 $
+ @version $Revision: 1.6 $
*/
public class AltClientLoginModule implements LoginModule
{
+ private static Logger log = Logger.getLogger(AltClientLoginModule.class);
private Subject subject;
private CallbackHandler callbackHandler;
/** Shared state between login modules */
@@ -69,6 +73,7 @@
private boolean useFirstPass;
private String username;
private char[] password = null;
+ private boolean trace;
/**
* Initialize this LoginModule.
@@ -76,15 +81,25 @@
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map sharedState, Map options)
{
+ this.trace = log.isTraceEnabled();
this.subject = subject;
this.callbackHandler = callbackHandler;
this.sharedState = sharedState;
+
+ //log securityDomain, if set.
+ if(trace)
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+
// Check for multi-threaded option
String mt = (String) options.get("multi-threaded");
- if( mt != null && Boolean.valueOf(mt).booleanValue() == true )
- { /* Turn on the server mode which uses thread local storage for
+ if( Boolean.valueOf(mt).booleanValue() == true )
+ {
+ /* Turn on the server mode which uses thread local storage for
the principal information.
*/
+ if( trace )
+ log.trace("Enabling multi-threaded mode");
SecurityAssociationActions.setServer();
}
@@ -94,6 +109,8 @@
*/
String passwordStacking = (String) options.get("password-stacking");
useFirstPass = passwordStacking != null;
+ if(trace && useFirstPass)
+ log.trace("Enabling useFirstPass mode");
}
/**
1.11 +15 -4 jbosssx/src/main/org/jboss/security/ClientLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClientLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/ClientLoginModule.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ClientLoginModule.java 19 Feb 2006 02:24:29 -0000 1.10
+++ ClientLoginModule.java 10 Jul 2006 04:42:37 -0000 1.11
@@ -21,7 +21,6 @@
*/
package org.jboss.security;
-
import java.io.IOException;
import java.security.Principal;
import java.util.Map;
@@ -36,6 +35,7 @@
import javax.security.auth.spi.LoginModule;
import org.jboss.logging.Logger;
+import org.jboss.security.SecurityConstants;
/** A simple implementation of LoginModule for use by JBoss clients for
the establishment of the caller identity and credentials. This simply sets
@@ -97,19 +97,28 @@
this.subject = subject;
this.callbackHandler = callbackHandler;
this.sharedState = sharedState;
+
+ //log securityDomain, if set.
+ if(trace)
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+
// Check for multi-threaded option
String flag = (String) options.get("multi-threaded");
if (Boolean.valueOf(flag).booleanValue() == true)
- { /* Turn on the server mode which uses thread local storage for
+ {
+ /* Turn on the server mode which uses thread local storage for
the principal information.
*/
- if( trace )
+ if(trace)
log.trace("Enabling multi-threaded mode");
SecurityAssociationActions.setServer();
}
flag = (String) options.get("restore-login-identity");
restoreLoginIdentity = Boolean.valueOf(flag).booleanValue();
+ if(trace)
+ log.trace("Enabling restore-login-identity mode");
/* Check for password sharing options. Any non-null value for
password_stacking sets useFirstPass as this module has no way to
@@ -117,6 +126,8 @@
*/
String passwordStacking = (String) options.get("password-stacking");
useFirstPass = passwordStacking != null;
+ if(trace && useFirstPass)
+ log.trace("Enabling useFirstPass mode");
}
/**
1.3 +8 -2 jbosssx/src/main/org/jboss/security/SecurityConstants.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityConstants.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/SecurityConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SecurityConstants.java 23 May 2006 20:38:00 -0000 1.2
+++ SecurityConstants.java 10 Jul 2006 04:42:37 -0000 1.3
@@ -21,13 +21,13 @@
*/
package org.jboss.security;
-//$Id: SecurityConstants.java,v 1.2 2006/05/23 20:38:00 asaldhana Exp $
+//$Id: SecurityConstants.java,v 1.3 2006/07/10 04:42:37 j2ee_junkie Exp $
/**
* Defines Constants for usage in the Security Layer
* @author <a href="mailto:Ani...@jb...">Anil Saldhana</a>
* @since Dec 30, 2005
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public interface SecurityConstants
{
@@ -47,6 +47,12 @@
String JASPI_CONTEXT_ROOT = "java:/jbsx";
/**
+ * The String option name used to pass in the security-domain
+ * name the LoginModule was configured in.
+ */
+ String SECURITY_DOMAIN_OPTION = "jboss.security.security_domain";
+
+ /**
* Default Authorization Manager context
*/
String AUTHORIZATION_PATH = "java:/authorizationMgr";
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 04:42:48
|
User: j2ee_junkie
Date: 06/07/10 00:42:37
Modified: src/main/org/jboss/security/auth/login
AuthenticationInfo.java
Log:
JBAS-1477: Pass in the security-domain name to the login modules for error reporting
Revision Changes Path
1.8 +9 -4 jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationInfo.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AuthenticationInfo.java 20 Jun 2006 04:45:23 -0000 1.7
+++ AuthenticationInfo.java 10 Jul 2006 04:42:37 -0000 1.8
@@ -21,18 +21,21 @@
*/
package org.jboss.security.auth.login;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Arrays;
import java.util.Map.Entry;
import javax.security.auth.AuthPermission;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.AppConfigurationEntry;
+import org.jboss.security.SecurityConstants;
+
/** The login module configuration information.
@author Sco...@jb...
- @version $Revision: 1.7 $
+ @version $Revision: 1.8 $
*/
public class AuthenticationInfo extends BaseAuthenticationInfo
{
@@ -52,7 +55,7 @@
/** Get a copy of the application authentication configuration. This requires
an AuthPermission("getLoginConfiguration") access.
*/
- public AppConfigurationEntry[] copyAppConfigurationEntry()
+ public AppConfigurationEntry[ ] copyAppConfigurationEntry()
{
SecurityManager sm = System.getSecurityManager();
if( sm != null )
@@ -61,8 +64,10 @@
for(int i = 0; i < copy.length; i ++)
{
AppConfigurationEntry entry = (AppConfigurationEntry) moduleEntries.get(i);
+ HashMap options = new HashMap(entry.getOptions());
+ options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
copy[i] = new AppConfigurationEntry(entry.getLoginModuleName(),
- entry.getControlFlag(), entry.getOptions());
+ entry.getControlFlag(), options);
}
return copy;
}
|
|
From: Chris G. <ce...@uf...> - 2006-07-10 04:42:48
|
User: j2ee_junkie
Date: 06/07/10 00:42:37
Modified: src/main/org/jboss/security/auth/spi
AbstractServerLoginModule.java
Log:
JBAS-1477: Pass in the security-domain name to the login modules for error reporting
Revision Changes Path
1.14 +8 -2 jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractServerLoginModule.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- AbstractServerLoginModule.java 30 Oct 2005 00:05:59 -0000 1.13
+++ AbstractServerLoginModule.java 10 Jul 2006 04:42:37 -0000 1.14
@@ -37,6 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.security.NestableGroup;
+import org.jboss.security.SecurityConstants;
import org.jboss.security.SimpleGroup;
import org.jboss.security.SimplePrincipal;
@@ -67,7 +68,7 @@
*
*@author <a href="edw...@cr...">Edward Kenworthy</a>, 12th Dec 2000
*@author Sco...@jb...
- *@version $Revision: 1.13 $
+ *@version $Revision: 1.14 $
*/
public abstract class AbstractServerLoginModule implements LoginModule
{
@@ -118,6 +119,11 @@
this.options = options;
log = Logger.getLogger(getClass());
log.trace("initialize");
+
+ //log securityDomain, if set.
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+
/* Check for password sharing options. Any non-null value for
password_stacking sets useFirstPass as this module has no way to
validate any shared password.
|
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:43:16
|
User: mproctor Date: 06/07/09 22:43:12 Added: maven2/org/drools/drools/3.0.2 drools-3.0.2.pom Log: -upload drools 3.0.2 Revision Changes Path 1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools/3.0.2/drools-3.0.2.pom Index: drools-3.0.2.pom =================================================================== <project> <modelVersion>4.0.0</modelVersion> <groupId>org.drools</groupId> <artifactId>drools</artifactId> <packaging>pom</packaging> <name>Drools</name> <version>3.0.2</version> <issueManagement> <system>jira</system> <url>http://jira.codehaus.org/browse/DROOLS</url> </issueManagement> <ciManagement> <system>continuum</system> <url>http://ci.codehaus.org:8001/continuum/servlet/continuum/target/Summary.vm/fid/continuumProject</url> <notifiers> <notifier> <type>mail</type> <configuration> <address>de...@dr...</address> </configuration> </notifier> <notifier> <type>irc</type> <configuration> <host>irc.codehaus.org</host> <port>6667</port> <channel>#drools</channel> </configuration> </notifier> </notifiers> </ciManagement> <mailingLists> <mailingList> <name>announce</name> <subscribe>ann...@dr...</subscribe> <unsubscribe>ann...@dr...</unsubscribe> <archive>http://archive.drools.codehaus.org/announce/</archive> </mailingList> <mailingList> <name>user</name> <subscribe>use...@dr...</subscribe> <unsubscribe>use...@dr...</unsubscribe> <archive>http://archive.drools.codehaus.org/user/</archive> </mailingList> <mailingList> <name>dev</name> <subscribe>dev...@dr...</subscribe> <unsubscribe>dev...@dr...</unsubscribe> <archive>http://archive.drools.codehaus.org/dev/</archive> </mailingList> <mailingList> <name>drools cvs messages</name> <subscribe>scm...@dr...</subscribe> <unsubscribe>scm...@dr...</unsubscribe> <archive>http://archive.drools.codehaus.org/scm/</archive> </mailingList> </mailingLists> <inceptionYear>2001</inceptionYear> <developers> <developer> <name>Mark Proctor</name> <id>mark</id> <email>mar...@jb...</email> <roles> <role>Project Lead</role> </roles> <timezone>0</timezone> <organization>JBoss Inc.</organization> </developer> <developer> <name>Michael Neale</name> <id>mic</id> <email>mic...@gm...</email> <roles> <role>Developer</role> </roles> <timezone>+10</timezone> <organization>JBoss Inc.</organization> </developer> <developer> <name>Kris Verlaenen</name> <id>kris</id> <email>kri...@gm...</email> <organization>JBoss Inc.</organization> <roles> <role>Developer</role> </roles> <timezone>+1</timezone> </developer> <developer> <name>Bob McWhirter</name> <id>bob</id> <email>bo...@we...</email> <organization>The Werken Company</organization> <roles> <role>Founder</role> </roles> <timezone>-5</timezone> </developer> <developer> <name>Edson Tirelli</name> <id>tirelli</id> <email>ti...@po...</email> <roles> <role>Developer</role> </roles> <timezone>-3</timezone> </developer> </developers> <scm> <connection>scm:svn:http://anonsvn.labs.jboss.com/labs/jbossrules/trunk/</connection> <url>http://anonsvn.labs.jboss.com/labs/jbossrules/trunk/</url> </scm> <organization> <name>Codehaus</name> <url>http://www.codehaus.org/</url> </organization> <repositories> <repository> <id>ibiblio</id> <url>http://www.ibiblio.org/maven2/</url> </repository> <repository> <id>jboss</id> <url>http://repository.jboss.com/maven2/</url> </repository> <repository> <id>basedir</id> <url>file://${basedir}/repository</url> </repository> <repository> <id>Maven Snapshots</id> <url>http://snapshots.maven.codehaus.org/maven2/</url> <snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>false</enabled> </releases> </repository> </repositories> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> <scope>test</scope> </dependency> </dependencies> <reporting> <plugins> <!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> </plugin--> <plugin> <artifactId>maven-javadoc-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> </plugin> </plugins> </reporting> <build> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.0-beta-1</version> <configuration> <descriptor>bin.xml</descriptor> <finalName>final_name</finalName> <outputDirectory>output/directory</outputDirectory> <workDirectory>target/assembly/work</workDirectory> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>dependency-maven-plugin</artifactId> <executions> <execution> <id>copy-dependencies</id> <phase>package</phase> <goals> <goal>copy-dependencies</goal> </goals> <configuration> <outputDirectory>../drools-ide/lib</outputDirectory> </configuration> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <minmemory>128m</minmemory> <maxmemory>512</maxmemory> <aggregate>true</aggregate> </configuration> </plugin> <!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> <configuration/> <executions> <execution> <phase>pre-site</phase> <goals> <goal>instrument</goal> <goal>aggregate</goal> </goals> </execution> </executions> </plugin--> </plugins> </build> <modules> <module>drools-core</module> <module>drools-compiler</module> <module>drools-jsr94</module> <module>drools-decisiontables</module> </modules> </project> |
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:43:16
|
User: mproctor
Date: 06/07/09 22:43:12
Added: maven2/org/drools/drools-decisiontables/3.0.2
drools-decisiontables-3.0.2.pom
drools-decisiontables-3.0.2.jar
Log:
-upload drools 3.0.2
Revision Changes Path
1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-decisiontables/3.0.2/drools-decisiontables-3.0.2.pom
Index: drools-decisiontables-3.0.2.pom
===================================================================
<?xml version="1.0"?><project>
<parent>
<artifactId>drools</artifactId>
<groupId>org.drools</groupId>
<version>3.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>drools-decisiontables</artifactId>
<name>Drools :: Decision Tables</name>
<version>3.0.2</version>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>package</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="Copying file ${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging} to ../drools-ide/lib/${project.artifactId}.${project.packaging}"></echo>
<copy file="${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging}" tofile="../drools-ide/lib/${project.artifactId}.${project.packaging}"></copy>
</tasks>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>basedir</id>
<url>file://${basedir}/../repository</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>poi</groupId>
<artifactId>poi</artifactId>
<version>2.5.1-final-20040804</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>3.0.2</version>
</dependency>
</dependencies>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>
1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-decisiontables/3.0.2/drools-decisiontables-3.0.2.jar
<<Binary file>>
|
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:43:16
|
User: mproctor
Date: 06/07/09 22:43:12
Added: maven2/org/drools/drools-jsr94/3.0.2
drools-jsr94-3.0.2.pom drools-jsr94-3.0.2.jar
Log:
-upload drools 3.0.2
Revision Changes Path
1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-jsr94/3.0.2/drools-jsr94-3.0.2.pom
Index: drools-jsr94-3.0.2.pom
===================================================================
<?xml version="1.0"?><project>
<parent>
<artifactId>drools</artifactId>
<groupId>org.drools</groupId>
<version>3.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>drools-jsr94</artifactId>
<name>Drools :: JSR-94 API Module</name>
<version>3.0.2</version>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>package</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="Copying file ${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging} to ../drools-ide/lib/${project.artifactId}.${project.packaging}"></echo>
<copy file="${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging}" tofile="../drools-ide/lib/${project.artifactId}.${project.packaging}"></copy>
</tasks>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
<property>
<name>jsr94.tck.configuration</name>
<value>${basedir}/target/test-classes/org/drools/jsr94/tck</value>
</property>
</systemProperties>
<includes>
<include>**/*Tests.java</include>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/ClassLoaderTest.java</exclude>
<exclude>**/RuleExecutionSetProviderTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>basedir</id>
<url>file://${basedir}/../repository</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>jsr94</groupId>
<artifactId>jsr94</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>jsr94</groupId>
<artifactId>jsr94-tck</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>jsr94</groupId>
<artifactId>jsr94-sigtest</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
</dependency>
</dependencies>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>
1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-jsr94/3.0.2/drools-jsr94-3.0.2.jar
<<Binary file>>
|
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:43:16
|
User: mproctor
Date: 06/07/09 22:43:12
Added: maven2/org/drools/drools-core/3.0.2 drools-core-3.0.2.pom
drools-core-3.0.2.jar
Log:
-upload drools 3.0.2
Revision Changes Path
1.1 date: 2006/07/10 02:43:11; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-core/3.0.2/drools-core-3.0.2.pom
Index: drools-core-3.0.2.pom
===================================================================
<?xml version="1.0"?><project>
<parent>
<artifactId>drools</artifactId>
<groupId>org.drools</groupId>
<version>3.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>drools-core</artifactId>
<name>Drools :: Rete-OO Core</name>
<version>3.0.2</version>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>package</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="Copying file ${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging} to ../drools-ide/lib/${project.artifactId}.${project.packaging}"></echo>
<copy file="${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging}" tofile="../drools-ide/lib/${project.artifactId}.${project.packaging}"></copy>
</tasks>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/LogicTransformerTest.java</exclude>
<exclude>**/LeapsMannersTest.java</exclude>
<exclude>**/ReteooMannersTest.java</exclude>
<exclude>**/LeapsWaltzTest.java</exclude>
<exclude>**/ReteooWaltzTest.java</exclude>
<exclude>**/TableTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>basedir</id>
<url>file://${basedir}/../repository</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>jung</groupId>
<artifactId>jung</artifactId>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.4.O</version>
</dependency>
</dependencies>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>
1.1 date: 2006/07/10 02:43:11; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-core/3.0.2/drools-core-3.0.2.jar
<<Binary file>>
|
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:43:16
|
User: mproctor
Date: 06/07/09 22:43:12
Added: maven2/org/drools/drools-compiler/3.0.2
drools-compiler-3.0.2.pom drools-compiler-3.0.2.jar
Log:
-upload drools 3.0.2
Revision Changes Path
1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-compiler/3.0.2/drools-compiler-3.0.2.pom
Index: drools-compiler-3.0.2.pom
===================================================================
<?xml version="1.0"?><project>
<parent>
<artifactId>drools</artifactId>
<groupId>org.drools</groupId>
<version>3.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>drools-compiler</artifactId>
<name>Drools :: Compiler</name>
<version>3.0.2</version>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>package</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="Copying file ${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging} to ../drools-ide/lib/${project.artifactId}.${project.packaging}"></echo>
<copy file="${project.build.directory}/${project.artifactId}-3.0.2.${project.packaging}" tofile="../drools-ide/lib/${project.artifactId}.${project.packaging}"></copy>
</tasks>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>basedir</id>
<url>file://${basedir}/../repository</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jci-janino</artifactId>
<version>2.4.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jci-eclipse</artifactId>
<version>3.2.0.666</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>stringtemplate</artifactId>
<version>2.3b6</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.0ea8</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
<version>3.2.0.666</version>
</dependency>
</dependencies>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>
1.1 date: 2006/07/10 02:43:12; author: mproctor; state: Exp;repository.jboss.com/maven2/org/drools/drools-compiler/3.0.2/drools-compiler-3.0.2.jar
<<Binary file>>
|
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:42:41
|
User: mproctor Date: 06/07/09 22:42:39 Log: Directory /cvsroot/jboss/repository.jboss.com/maven2/org/drools/drools/3.0.2 added to the repository |
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:42:41
|
User: mproctor Date: 06/07/09 22:42:39 Log: Directory /cvsroot/jboss/repository.jboss.com/maven2/org/drools/drools-core/3.0.2 added to the repository |
185 messages has been excluded from this view by a project administrator.
