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: Manik S. <msu...@jb...> - 2006-07-06 10:49:15
|
User: msurtani
Date: 06/07/06 06:49:12
Modified: src/org/jboss/cache/marshall VersionAwareMarshaller.java
Log:
Made this more Habanero-friendly
Revision Changes Path
1.6 +9 -1 JBossCache/src/org/jboss/cache/marshall/VersionAwareMarshaller.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: VersionAwareMarshaller.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/VersionAwareMarshaller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- VersionAwareMarshaller.java 8 Jun 2006 22:00:35 -0000 1.5
+++ VersionAwareMarshaller.java 6 Jul 2006 10:49:12 -0000 1.6
@@ -37,6 +37,7 @@
private static final int VERSION_LEGACY = 1;
private static final int VERSION_140 = 14;
+ private static final int VERSION_200 =20;
private int versionInt;
@@ -54,6 +55,7 @@
switch (versionInt)
{
+ case VERSION_200:
case VERSION_140:
defaultMarshaller = new TreeCacheMarshaller140(manager, defaultInactive, useRegionBasedMarshalling);
marshallers.put(new Integer(VERSION_140), defaultMarshaller);
@@ -62,6 +64,12 @@
defaultMarshaller = new LegacyTreeCacheMarshaller(manager, defaultInactive, useRegionBasedMarshalling);
marshallers.put(new Integer(VERSION_LEGACY), defaultMarshaller);
}
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Initialised with version "+version+" and versionInt " + versionInt);
+ log.debug("Using default marshaller " + defaultMarshaller.getClass());
+ }
}
/**
@@ -97,7 +105,7 @@
int major = Integer.parseInt(versionComponents[0]);
int minor = Integer.parseInt(versionComponents[1]);
- return minor > 3 ? (10 * major) + minor : 1;
+ return (major > 1 || minor > 3) ? (10 * major) + minor : 1;
}
catch (Exception e)
{
|
|
From: Alex L. <al...@jb...> - 2006-07-06 09:36:49
|
User: aloubyansky Date: 06/07/06 05:36:47 Modified: jboss/jbossxb/snapshot/lib jboss-xml-binding.jar Log: latest snapshot, includes JBXB-73 Revision Changes Path 1.16 +96 -92 repository.jboss.com/jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar <<Binary file>> |
|
From: Ben W. <bw...@jb...> - 2006-07-06 09:25:42
|
User: bwang
Date: 06/07/06 05:25:40
Modified: src-50/org/jboss/cache/pojo BaseInterceptor.java
CollectionClassHandler.java ObjectGraphHandler.java
PojoTreeCache.java PojoUtil.java
TreeCacheAopDelegate.java
Log:
Minor refactoring.
Revision Changes Path
1.3 +4 -0 JBossCache/src-50/org/jboss/cache/pojo/BaseInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/BaseInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BaseInterceptor.java 27 Jun 2006 05:25:43 -0000 1.2
+++ BaseInterceptor.java 6 Jul 2006 09:25:40 -0000 1.3
@@ -28,4 +28,8 @@
AOPInstance getAopInstance();
void setAopInstance(AOPInstance aopInstance);
+
+// BaseInterceptor cloneInterceptor();
+
+// void setInterceptor(BaseInterceptor interceptor);
}
1.5 +1 -24 JBossCache/src-50/org/jboss/cache/pojo/CollectionClassHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CollectionClassHandler.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/CollectionClassHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CollectionClassHandler.java 6 Jul 2006 02:42:35 -0000 1.4
+++ CollectionClassHandler.java 6 Jul 2006 09:25:40 -0000 1.5
@@ -28,7 +28,7 @@
*
* @author Ben Wang
* Date: Aug 4, 2005
- * @version $Id: CollectionClassHandler.java,v 1.4 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: CollectionClassHandler.java,v 1.5 2006/07/06 09:25:40 bwang Exp $
*/
class CollectionClassHandler
{
@@ -250,27 +250,4 @@
return true;
}
-
- void collectionReplaceWithProxy(Object obj, Object value, Field field, Fqn tmpFqn)
- throws CacheException
- {
- // If value (field member) is of Collection type, e.g., composite class
- // that contains Collection member, we will swap out the old reference
- // with the proxy one.
- // This can probably be optimized with check for instanceof proxy
- if (value instanceof Map || value instanceof List || value instanceof Set)
- {
- Object newValue = cache_.getObject(tmpFqn);
- try
- {
- field.set(obj, newValue);
- } catch (IllegalAccessException e)
- {
- log.error("collectionReplaceWithProxy(): Can't swap out the Collection class of field " + field.getName() +
- "Exception " + e);
- throw new CacheException("CollectionClassHandler.collectionReplaceWithProxy(): Can't swap out the Collection class of field \" +field.getName(),"
- + e);
- }
- }
- }
}
1.4 +1 -5 JBossCache/src-50/org/jboss/cache/pojo/ObjectGraphHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ObjectGraphHandler.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/ObjectGraphHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ObjectGraphHandler.java 27 Jun 2006 06:19:17 -0000 1.3
+++ ObjectGraphHandler.java 6 Jul 2006 09:25:40 -0000 1.4
@@ -22,7 +22,7 @@
*
* @author Ben Wang
* Date: Aug 4, 2005
- * @version $Id: ObjectGraphHandler.java,v 1.3 2006/06/27 06:19:17 bwang Exp $
+ * @version $Id: ObjectGraphHandler.java,v 1.4 2006/07/06 09:25:40 bwang Exp $
*/
class ObjectGraphHandler
{
@@ -66,10 +66,6 @@
boolean objectGraphPut(Fqn fqn, Interceptor interceptor, CachedType type) throws CacheException
{
Fqn originalFqn = null;
- if (interceptor == null)
- {
- return false; // No interceptor no object graph possibility.
- }
if (interceptor instanceof AbstractCollectionInterceptor)
{
1.5 +0 -4 JBossCache/src-50/org/jboss/cache/pojo/PojoTreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/PojoTreeCache.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PojoTreeCache.java 6 Jul 2006 05:48:37 -0000 1.4
+++ PojoTreeCache.java 6 Jul 2006 09:25:40 -0000 1.5
@@ -41,12 +41,8 @@
// Class -> CachedType
// use WeakHashMap to allow class reloading
private Map cachedTypes = new WeakHashMap();
- // Use batch mode tm to simulate the batch processing.
- private TransactionManager localTm_ = BatchModeTransactionManager.getInstance();
private TreeCacheAopDelegate delegate_;
private Element config_ = null;
- private final String LOCK = "_lock_";
- private final int RETRY = 5; // retry times for lockPojo just in case there is upgrade exception during concurrent access.
// boolean detachPojoWhenEvicted_ = false;
private boolean marshallNonSerializable_ = false;
1.2 +21 -1 JBossCache/src-50/org/jboss/cache/pojo/PojoUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoUtil.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/PojoUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PojoUtil.java 6 Jul 2006 02:42:35 -0000 1.1
+++ PojoUtil.java 6 Jul 2006 09:25:40 -0000 1.2
@@ -9,11 +9,14 @@
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.Interceptor;
+import org.jboss.cache.CacheException;
+
+import java.lang.reflect.Field;
/**
*
* @author Ben Wang
- * @version $Id: PojoUtil.java,v 1.1 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: PojoUtil.java,v 1.2 2006/07/06 09:25:40 bwang Exp $
*/
public class PojoUtil
{
@@ -37,4 +40,21 @@
advisor.appendInterceptor(interceptor);
}
+ void collectionReplaceWithProxy(Object obj, Object value, Field field, Object newValue)
+ {
+ // If value (field member) is of Collection type, e.g., composite class
+ // that contains Collection member, we will swap out the old reference
+ // with the proxy one.
+ // This can probably be optimized with check for instanceof proxy
+ try
+ {
+ field.set(obj, newValue);
+ } catch (IllegalAccessException e)
+ {
+ throw new PojoCacheException(
+ "PojoUtil.collectionReplaceWithProxy(): Can't swap out the Collection class of field \" " +
+ "+field.getName()," + e);
+ }
+ }
+
}
1.5 +10 -40 JBossCache/src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheAopDelegate.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- TreeCacheAopDelegate.java 6 Jul 2006 02:42:35 -0000 1.4
+++ TreeCacheAopDelegate.java 6 Jul 2006 09:25:40 -0000 1.5
@@ -16,14 +16,9 @@
import org.jboss.aop.proxy.ClassProxy;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
-import org.jboss.cache.TreeNode;
-import org.jboss.cache.marshall.MethodCallFactory;
-import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.pojo.collection.AbstractCollectionInterceptor;
import org.jboss.cache.pojo.memory.FieldPersistentReference;
import org.jboss.cache.pojo.util.AopUtil;
-import org.jgroups.blocks.MethodCall;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -49,7 +44,7 @@
// Use ThreadLocal to hold a boolean isBulkRemove
private ThreadLocal bulkRemove_ = new ThreadLocal();
private final String DETACH = "DETACH";
- private PojoUtil util = new PojoUtil();
+ private PojoUtil util_ = new PojoUtil();
public TreeCacheAopDelegate(PojoTreeCache cache)
{
@@ -137,7 +132,7 @@
InstanceAdvisor advisor = ((Advised) obj)._getInstanceAdvisor();
CacheInterceptor interceptor = new CacheInterceptor(cache_, fqn, type);
interceptor.setAopInstance(aopInstance);
- util.attachInterceptor(advisor, interceptor);
+ util_.attachInterceptor(advisor, interceptor);
} else
{ // Must be Collection classes. We will use aop.ClassProxy instance instead.
try
@@ -205,8 +200,7 @@
// Step Check for cross references
Interceptor interceptor = AopUtil.findCacheInterceptor(advisor);
- // Let's check for object graph, e.g., multiple and circular references first
- if (graphHandler_.objectGraphPut(fqn, interceptor, type))
+ if (interceptor != null && graphHandler_.objectGraphPut(fqn, interceptor, type))
{ // found cross references
return oldValue;
}
@@ -423,7 +417,7 @@
// Insert interceptor at runtime
CacheInterceptor interceptor = new CacheInterceptor(cache_, fqn, type);
interceptor.setAopInstance(aopInstance);
- util.attachInterceptor(advisor, interceptor);
+ util_.attachInterceptor(advisor, interceptor);
map.put(AOPInstance.KEY, aopInstance);
// This is put into map first.
@@ -486,7 +480,11 @@
_putObject(tmpFqn, value);
// If it is Collection classes, we replace it with dynamic proxy.
// But we will have to ignore it if value is null
- collectionHandler_.collectionReplaceWithProxy(obj, value, field, tmpFqn);
+ if (value instanceof Map || value instanceof List || value instanceof Set)
+ {
+ Object newValue = cache_.getObject(tmpFqn);
+ util_.collectionReplaceWithProxy(obj, value, field, newValue);
+ }
}
// Need to make sure this is behind put such that obj.toString is done correctly.
@@ -501,34 +499,6 @@
return CachedType.hasAnnotation(clazz, advisor, type);
}
- private void createNode(Fqn fqn, GlobalTransaction tx)
- {
- TreeNode n, child_node;
- Object child_name;
- Fqn tmp_fqn = Fqn.ROOT;
-
- if (fqn == null) return;
- int treeNodeSize = fqn.size();
- n = cache_.getRoot();
- for (int i = 0; i < treeNodeSize; i++)
- {
- child_name = fqn.get(i);
- tmp_fqn = new Fqn(tmp_fqn, child_name);
- child_node = n.getChild(child_name);
- if (child_node == null)
- {
- child_node = n.createChild(child_name, tmp_fqn, n);
- if (tx != null)
- {
- MethodCall undo_op = MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal,
- new Object[]{tx, tmp_fqn, Boolean.FALSE});
- cache_.addUndoOperation(tx, undo_op);
- }
- }
- n = child_node;
- }
- }
-
/**
* Note that caller of this method will take care of synchronization within the <code>fqn</code> sub-tree.
*
@@ -641,7 +611,7 @@
{
log.debug("regularRemoveObject(): removed cache interceptor fqn: " + fqn + " interceptor: " + interceptor);
}
- util.detachInterceptor(advisor, interceptor);
+ util_.detachInterceptor(advisor, interceptor);
}
}
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:29
|
User: wolfc
Date: 06/07/06 04:35:24
Modified: src/main/org/jboss/ejb3/injection EJBHandler.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.37 +12 -14 jboss-ejb3/src/main/org/jboss/ejb3/injection/EJBHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EJBHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/injection/EJBHandler.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- EJBHandler.java 5 Jul 2006 10:51:36 -0000 1.36
+++ EJBHandler.java 6 Jul 2006 08:35:24 -0000 1.37
@@ -47,7 +47,7 @@
* Searches bean class for all @Inject and create Injectors
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.36 $
+ * @version $Revision: 1.37 $
*/
public class EJBHandler
{
@@ -462,12 +462,10 @@
}
}
- private static Class getBusinessInterface(EJB ref, Class defaultInterface)
+ private static Class getBeanInterface(EJB ref, Class defaultInterface)
{
if(!ref.beanInterface().equals(Object.class))
return ref.beanInterface();
- if(!ref.businessInterface().equals(Object.class))
- return ref.businessInterface();
return defaultInterface;
}
@@ -483,22 +481,22 @@
if (ref.beanName().equals("") && memberType == null)
throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB. Please fill out the beanName and/or businessInterface attributes");
- Class businessInterface = getBusinessInterface(ref, memberType);
+ Class beanInterface = getBeanInterface(ref, memberType);
if (ref.beanName().equals(""))
{
try
{
- rtn = (EJBContainer)container.resolveEjbContainer(businessInterface);
+ rtn = (EJBContainer)container.resolveEjbContainer(beanInterface);
}
catch (NameNotFoundException e)
{
- log.warn("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
+ log.warn("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + beanInterface.getName() + ") " + e.getMessage());
}
}
else
{
- rtn = (EJBContainer)container.resolveEjbContainer(ref.beanName(), businessInterface);
+ rtn = (EJBContainer)container.resolveEjbContainer(ref.beanName(), beanInterface);
}
return rtn;
@@ -516,29 +514,29 @@
if (ref.beanName().equals("") && memberType == null)
throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB. Please fill out the beanName and/or businessInterface attributes");
- Class businessInterface = getBusinessInterface(ref, memberType);
+ Class beanInterface = getBeanInterface(ref, memberType);
if (ref.beanName().equals(""))
{
try
{
- jndiName = container.getEjbJndiName(businessInterface);
+ jndiName = container.getEjbJndiName(beanInterface);
}
catch (NameNotFoundException e)
{
- throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
+ throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + beanInterface.getName() + ") " + e.getMessage());
}
if (jndiName == null)
{
- throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ")");
+ throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + beanInterface.getName() + ")");
}
}
else
{
- jndiName = container.getEjbJndiName(ref.beanName(), businessInterface);
+ jndiName = container.getEjbJndiName(ref.beanName(), beanInterface);
if (jndiName == null)
{
- throw new RuntimeException("For EJB " + container.getIdentifier() + "could not find jndi binding based on beanName and business interface for @EJB(" + ref.beanName() + ", " + businessInterface.getName() + ")");
+ throw new RuntimeException("For EJB " + container.getIdentifier() + "could not find jndi binding based on beanName and business interface for @EJB(" + ref.beanName() + ", " + beanInterface.getName() + ")");
}
}
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:27
|
User: wolfc
Date: 06/07/06 04:35:25
Modified: src/test/org/jboss/ejb3/test/regression/ejbthree620
CalculatorBean.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.2 +6 -6 jboss-ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CalculatorBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CalculatorBean.java 5 Jul 2006 10:51:36 -0000 1.1
+++ CalculatorBean.java 6 Jul 2006 08:35:25 -0000 1.2
@@ -22,27 +22,27 @@
package org.jboss.ejb3.test.regression.ejbthree620;
import javax.ejb.EJB;
-import javax.ejb.EJBException;
+//import javax.ejb.EJBException;
import javax.ejb.Stateless;
/**
* Comment
*
* @author <a href="mailto:car...@jb...">Carlo de Wolf</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
@Stateless
public class CalculatorBean implements Calculator
{
@EJB(beanInterface=Calculator.class) Object other;
- @EJB(businessInterface=Calculator.class) Object deprecatedOther;
+// @EJB(businessInterface=Calculator.class) Object deprecatedOther;
public int add(int a, int b)
{
int result1 = ((Calculator) other).performAddition(a, b);
- int result2 = ((Calculator) deprecatedOther).performAddition(a, b);
- if(result1 != result2)
- throw new EJBException("something horrible happened");
+// int result2 = ((Calculator) deprecatedOther).performAddition(a, b);
+// if(result1 != result2)
+// throw new EJBException("something horrible happened");
return result1;
}
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:27
|
User: wolfc
Date: 06/07/06 04:35:25
Modified: src/test/org/jboss/ejb3/test/reference21_30
Session30Bean.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.13 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Session30Bean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Session30Bean.java 1 Jun 2006 23:10:29 -0000 1.12
+++ Session30Bean.java 6 Jul 2006 08:35:25 -0000 1.13
@@ -34,7 +34,7 @@
import org.jboss.logging.Logger;
/**
- * @version <tt>$Revision: 1.12 $</tt>
+ * @version <tt>$Revision: 1.13 $</tt>
* @author <a href="mailto:bde...@jb...">William DeCoste</a>
*/
@Stateless(name="Session30")
@@ -42,7 +42,7 @@
@Local(LocalSession30.class)
@RemoteBinding(jndiBinding = "Session30")
@LocalBinding(jndiBinding = "LocalSession30")
-@EJBs({@EJB(name="injected", businessInterface=org.jboss.ejb3.test.reference21_30.Session21.class, beanName="Session21")})
+@EJBs({@EJB(name="injected", beanInterface=org.jboss.ejb3.test.reference21_30.Session21.class, beanName="Session21")})
public class Session30Bean
{
private static final Logger log = Logger.getLogger(Session30Bean.class);
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:26
|
User: wolfc
Date: 06/07/06 04:35:24
Modified: src/test/org/jboss/ejb3/test/security
UnsecuredStatelessSessionBean2.java
Level1CallerBean.java StatelessSessionBean2.java
PublicSessionBean.java CallerBean2.java
PublicSessionFacade.java CallerFacadeBean.java
SecurityContextBean.java FacadeTargetBean.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.6 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UnsecuredStatelessSessionBean2.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UnsecuredStatelessSessionBean2.java 1 Jun 2006 23:10:29 -0000 1.5
+++ UnsecuredStatelessSessionBean2.java 6 Jul 2006 08:35:24 -0000 1.6
@@ -37,12 +37,12 @@
identity propagation.
@author Sco...@jb...
-@version $Revision: 1.5 $
+@version $Revision: 1.6 $
*/
@Stateless
@Remote(org.jboss.ejb3.test.security.StatelessSession.class)
@RemoteBinding(jndiBinding = "spec.UnsecureStatelessSession2")
-@EJBs({@EJB(name="Session", businessInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
+@EJBs({@EJB(name="Session", beanInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
public class UnsecuredStatelessSessionBean2
{
org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
1.6 +3 -3 jboss-ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Level1CallerBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Level1CallerBean.java 1 Jun 2006 23:10:29 -0000 1.5
+++ Level1CallerBean.java 6 Jul 2006 08:35:24 -0000 1.6
@@ -41,7 +41,7 @@
/**
* A simple session bean that calls the CalleeBean
* @author Sco...@jb...
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
@Stateless(name="Level1CallerBean")
@Remote(CalledSession.class)
@@ -49,8 +49,8 @@
@RunAs("InternalRole")
@RolesAllowed({"Echo"})
@SecurityDomain("spec-test")
-@EJBs({@EJB(name="Caller2", businessInterface=org.jboss.ejb3.test.security.CalledSession.class, beanName="CallerBean2"),
- @EJB(name="Callee", businessInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
+@EJBs({@EJB(name="Caller2", beanInterface=org.jboss.ejb3.test.security.CalledSession.class, beanName="CallerBean2"),
+ @EJB(name="Callee", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
public class Level1CallerBean implements CalledSession
{
private static Category log = Category.getInstance(Level1CallerBean.class);
1.9 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StatelessSessionBean2.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- StatelessSessionBean2.java 22 Jun 2006 20:53:15 -0000 1.8
+++ StatelessSessionBean2.java 6 Jul 2006 08:35:24 -0000 1.9
@@ -40,14 +40,14 @@
identity propagation.
@author Sco...@jb...
-@version $Revision: 1.8 $
+@version $Revision: 1.9 $
*/
@Stateless(name="StatelessSession2")
@Remote(org.jboss.ejb3.test.security.StatelessSession.class)
@RemoteBinding(jndiBinding = "spec.StatelessSession2")
@RolesAllowed({"Echo"})
@SecurityDomain("spec-test")
-@EJBs({@EJB(name="Session", businessInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
+@EJBs({@EJB(name="Session", beanInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
public class StatelessSessionBean2
{
private static final Logger log = Logger
1.5 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PublicSessionBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PublicSessionBean.java 1 Jun 2006 23:10:29 -0000 1.4
+++ PublicSessionBean.java 6 Jul 2006 08:35:24 -0000 1.5
@@ -38,14 +38,14 @@
echo method call to the PrivateSession bean to test run-as.
@author Sco...@jb...
-@version $Revision: 1.4 $
+@version $Revision: 1.5 $
*/
@Stateless(name="PublicSession")
@Remote(org.jboss.ejb3.test.security.Session.class)
@RemoteBinding(jndiBinding = "spec.PublicSession")
@SecurityDomain("spec-test")
@RolesAllowed({"Echo"})
-@EJBs({@EJB(name="PrivateSession", businessInterface=org.jboss.ejb3.test.security.Session.class, beanName="PrivateSession")})
+@EJBs({@EJB(name="PrivateSession", beanInterface=org.jboss.ejb3.test.security.Session.class, beanName="PrivateSession")})
public class PublicSessionBean
{
@Resource SessionContext sessionContext;
1.6 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CallerBean2.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CallerBean2.java 1 Jun 2006 23:10:29 -0000 1.5
+++ CallerBean2.java 6 Jul 2006 08:35:24 -0000 1.6
@@ -42,14 +42,14 @@
/**
* A simple session bean that calls the CalleeBean
* @author Sco...@jb...
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
@Stateless(name="CallerBean2")
@Remote(CalledSession.class)
@RemoteBinding(jndiBinding = "spec.Level2CallerBean")
@RolesAllowed({"InternalRole"})
@SecurityDomain("spec-test")
-@EJBs({@EJB(name="Callee", businessInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
+@EJBs({@EJB(name="Callee", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
public class CallerBean2 implements CalledSession
{
private static Category log = Category.getInstance(CallerBean2.class);
1.5 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PublicSessionFacade.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PublicSessionFacade.java 1 Jun 2006 23:10:29 -0000 1.4
+++ PublicSessionFacade.java 6 Jul 2006 08:35:24 -0000 1.5
@@ -38,14 +38,14 @@
/**
* @author Sco...@jb...
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
@Stateless(name="PublicSessionFacade")
@Remote(org.jboss.ejb3.test.security.SessionFacade.class)
@RemoteBinding(jndiBinding = "spec.PublicSessionFacade")
@SecurityDomain("spec-test")
@RolesAllowed({"Echo"})
-@EJBs({@EJB(name="TargetEJB", businessInterface=org.jboss.ejb3.test.security.Session.class, beanName="PublicSession")})
+@EJBs({@EJB(name="TargetEJB", beanInterface=org.jboss.ejb3.test.security.Session.class, beanName="PublicSession")})
public class PublicSessionFacade
{
@Resource SessionContext sessionContext;
1.5 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CallerFacadeBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CallerFacadeBean.java 1 Jun 2006 23:10:29 -0000 1.4
+++ CallerFacadeBean.java 6 Jul 2006 08:35:24 -0000 1.5
@@ -39,14 +39,14 @@
/**
* A simple session bean that calls the CalleeBean
* @author Sco...@jb...
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
@Stateless(name="CallerFacadeBean-testRunAsSFSB")
@Remote(org.jboss.ejb3.test.security.CalledSession.class)
@RemoteBinding(jndiBinding = "spec.CallerFacadeBean-testRunAsSFSB")
@SecurityDomain("spec-test")
@RolesAllowed({"Echo"})
-@EJBs({@EJB(name="CalledSessionLocal", businessInterface=org.jboss.ejb3.test.security.CalledSessionLocal.class, beanName="CallerFacadeTargetSFSB")})
+@EJBs({@EJB(name="CalledSessionLocal", beanInterface=org.jboss.ejb3.test.security.CalledSessionLocal.class, beanName="CallerFacadeTargetSFSB")})
public class CallerFacadeBean
{
private static Category log = Category.getInstance(CallerFacadeBean.class);
1.5 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityContextBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SecurityContextBean.java 1 Jun 2006 23:10:29 -0000 1.4
+++ SecurityContextBean.java 6 Jul 2006 08:35:24 -0000 1.5
@@ -38,14 +38,14 @@
/**
* @author Sco...@jb...
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
@Stateless(name="UserInRoleContextSession")
@Remote(org.jboss.ejb3.test.security.SecurityContext.class)
@RemoteBinding(jndiBinding = "spec.UserInRoleContextSession")
@SecurityDomain("spec-test")
@RolesAllowed({"Role1", "Role2"})
-@EJBs({@EJB(name="CalledBean", businessInterface=org.jboss.ejb3.test.security.SecurityContext.class, beanName="UserInRoleContextSessionTarget")})
+@EJBs({@EJB(name="CalledBean", beanInterface=org.jboss.ejb3.test.security.SecurityContext.class, beanName="UserInRoleContextSessionTarget")})
public class SecurityContextBean implements SecurityContext
{
static Logger log = Logger.getLogger(SecurityContextBean.class);
1.5 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacadeTargetBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FacadeTargetBean.java 1 Jun 2006 23:10:29 -0000 1.4
+++ FacadeTargetBean.java 6 Jul 2006 08:35:24 -0000 1.5
@@ -39,14 +39,14 @@
/**
* A simple session bean that calls the CalleeBean
* @author Sco...@jb...
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
@Stateful(name="CallerFacadeTargetSFSB")
@Local(org.jboss.ejb3.test.security.CalledSessionLocal.class)
@Remote(org.jboss.ejb3.test.security.CalledSession.class)
@RemoteBinding(jndiBinding="spec.CallerFacadeTargetSFSB")
@SecurityDomain("spec-test")
-@EJBs({@EJB(name="StatelessSessionLocal", businessInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
+@EJBs({@EJB(name="StatelessSessionLocal", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
public class FacadeTargetBean
{
private static Category log = Category.getInstance(FacadeTargetBean.class);
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:26
|
User: wolfc
Date: 06/07/06 04:35:24
Modified: src/test/org/jboss/ejb3/test/initial ClassInjectedBean.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.12 +2 -2 jboss-ejb3/src/test/org/jboss/ejb3/test/initial/ClassInjectedBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClassInjectedBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/initial/ClassInjectedBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ClassInjectedBean.java 1 Jun 2006 23:10:28 -0000 1.11
+++ ClassInjectedBean.java 6 Jul 2006 08:35:24 -0000 1.12
@@ -31,10 +31,10 @@
/**
* @author <a href="mailto:kab...@jb...">Kabir Khan</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
@Stateless
-@EJBs({@EJB(name="injected", businessInterface=org.jboss.ejb3.test.initial.TestStatus.class, beanName="TestStatusBean")})
+@EJBs({@EJB(name="injected", beanInterface=org.jboss.ejb3.test.initial.TestStatus.class, beanName="TestStatusBean")})
@Remote(ClassInjected.class)
public class ClassInjectedBean implements ClassInjected
{
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:26
|
User: wolfc
Date: 06/07/06 04:35:25
Modified: docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean
Session1Bean.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.6 +2 -2 jboss-ejb3/docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Session1Bean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Session1Bean.java 1 Jun 2006 23:09:08 -0000 1.5
+++ Session1Bean.java 6 Jul 2006 08:35:25 -0000 1.6
@@ -34,14 +34,14 @@
import org.jboss.logging.Logger;
/**
- * @version <tt>$Revision: 1.5 $</tt>
+ * @version <tt>$Revision: 1.6 $</tt>
* @author <a href="mailto:bde...@jb...">William DeCoste</a>
*/
@Stateful(name="Session1")
@Remote(Session1Remote.class)
@RemoteHome(Session1RemoteHome.class)
@RemoteBinding(jndiBinding = "Session1Remote")
-@EJBs({@EJB(name="session2", businessInterface=org.jboss.tutorial.ejb21_client_adaptors.bean.Session2LocalHome.class, beanName="Session2")})
+@EJBs({@EJB(name="session2", beanInterface=org.jboss.tutorial.ejb21_client_adaptors.bean.Session2LocalHome.class, beanName="Session2")})
public class Session1Bean
{
private static final Logger log = Logger.getLogger(Session1Bean.class);
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 08:35:24
|
User: wolfc
Date: 06/07/06 04:35:20
Modified: src/main/javax/ejb EJB.java
Log:
EJBTHREE-620: removed java.ejb.EJB.businessInterface
Revision Changes Path
1.6 +2 -5 jboss-ejb3x/src/main/javax/ejb/EJB.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EJB.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3x/src/main/javax/ejb/EJB.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- EJB.java 5 Jul 2006 10:51:31 -0000 1.5
+++ EJB.java 6 Jul 2006 08:35:20 -0000 1.6
@@ -30,16 +30,13 @@
* The EJB annotation denotes a reference to an EJB 3.0 session bean.
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
public @interface EJB
{
String name() default "";
- @Deprecated
- Class businessInterface() default java.lang.Object.class;
-
Class beanInterface() default java.lang.Object.class;
String beanName() default "";
|
|
From: Ron S. <ron...@ya...> - 2006-07-06 07:36:07
|
User: rsigal
Date: 06/07/06 03:36:05
Modified: docs/guide/en master.xml
Log:
JBREM-461, JBREM-520, JBREM-513: (1) Added section about configuring socket and server socket factores; (2) added section about SSL RMI; (3) expanded section about SSL multiplex.
Revision Changes Path
1.24 +295 -32 JBossRemoting/docs/guide/en/master.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: master.xml
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/docs/guide/en/master.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- master.xml 31 Mar 2006 03:03:52 -0000 1.23
+++ master.xml 6 Jul 2006 07:36:05 -0000 1.24
@@ -71,7 +71,7 @@
</listitem>
<listitem>
- <para>RMI</para>
+ <para>RMI (SSL RMI)</para>
</listitem>
<listitem>
@@ -79,7 +79,7 @@
</listitem>
<listitem>
- <para>Multiplex</para>
+ <para>Multiplex (SSL Multiplex)</para>
</listitem>
<listitem>
@@ -1005,6 +1005,195 @@
one-way invocations on the server side will block the calling thread
if all the threads in the pool are in use until one is
released.</para>
+
+ <section>
+ <title>Socket factories and server socket factories</title>
+
+ <para>
+ All server invokers use server sockets, and it makes sense,
+ therefore, to be able to configure server invokers with
+ server socket factories. It is also true, though less obvious.
+ that server invokers create sockets (other than by way of
+ server sockets). When a server invoker makes an asynchronous
+ callback to a client, it creates a client invoker, which creates a
+ socket. Moreover, some server invokers, e.g., the RMI server invoker,
+ have their own idiosyncratic uses for socket factories. Remoting offers a
+ number of ways of configuring socket factories and server socket
+ factories, and these apply to all server invokers.
+ </para>
+
+ <para>For <classname>ServerSocketFactory</classname>s, there are
+ eight means of configuration:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Call <methodname>Connector.setServerSocketFactory()</methodname>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>Get the <classname>ServerInvoker</classname> from the
+ <classname>Connector</classname> and call
+ <methodname>ServerInvoker.setServerSocketFactory()</methodname>.</para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put a constructed <classname>ServerSocketFactory</classname> in a
+ configuration map, using key
+ <constant>Remoting.CUSTOM_SERVER_SOCKET_FACTORY</constant>,
+ and pass the map to one of the <classname>Connector</classname>
+ constructors.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put the <classname>ObjectName</classname> of a
+ <classname>ServerSocketFactoryMBean</classname> in a configuration map,
+ using key <constant>ServerInvoker.SERVER_SOCKET_FACTORY</constant>,
+ and pass the map to one of the <classname>Connector</classname>
+ constructors.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put the class name of a <classname>ServerSocketFactory</classname>
+ in a configuration map, using key
+ <constant>ServerInvoker.SERVER_SOCKET_FACTORY</constant>,
+ and pass the map to one of the <classname>Connector</classname> constructors.
+ In this case, an instance of the class will be created using the default
+ constructor. </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put a set of SSL parameters, using the keys in
+ <classname>org.jboss.remoting.security.SSLSocketBuilder</classname>, in a
+ configuration map and pass the map to one of the
+ <classname>Connector</classname> constructors. These will be used by
+ <classname>SSLSocketBuilder</classname> to create a
+ <classname>CustomSSLServerSocketFactory</classname>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Configure an appropriate set of SSL system properties
+ and use one of the SSL transports (https, sslmultiplex,
+ sslrmi, or sslsocket). The properties will be used to
+ create some kind of <classname>SSLServerSocketFactory</classname>,
+ as determined by the transport.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Use one of the non-SSL transports and do nothing. A default
+ <classname>ServerSocketFactory</classname> will be constructed.
+ </para>
+ </listitem>
+ </orderedlist>
+
+ <para>
+ These methods are essentially in descending order of precedence.
+ Methods 1) and 2) have equal precedence, and the last one to be
+ used prior to calling <methodname>Connector.create()</methodname>
+ will determine the <classname>ServerSocketFactory</classname> that
+ gets used. Otherwise, if methods 3) and 6), for example, are both
+ used, the factory passed in method 3) will prevail.</para>
+
+ <para>
+ For <classname>SocketFactory</classname>s, there are also eight means
+ of configuration, and they are essentially the same:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>
+ Call <methodname>Connector.setSocketFactory()</methodname>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Get the <classname>ServerInvoker</classname> from the
+ <classname>Connector</classname> and call
+ <methodname>ServerInvoker.setSocketFactory()</methodname>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put a constructed <classname>SocketFactory</classname> in a
+ configuration map, using key
+ <constant>Remoting.CUSTOM_SOCKET_FACTORY</constant>, and pass
+ the map to one of the <classname>Connector</classname> constructors.
+
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put the <classname>ObjectName</classname> of a
+ <classname>ServerSocketFactoryMBean</classname> in a configuration
+ map, using key <constant>ServerInvoker.SERVER_SOCKET_FACTORY</constant>,
+ and pass the map to one of the <classname>Connector</classname>
+ constructors. If the MBean has type
+ <classname>SSLServerSocketFactoryServiceMBean</classname>, its
+ configuration information will be gathered and used to construct a
+ <classname>CustomSSLSocketFactory</classname>.
+ <emphasis role="bold">Note.</emphasis> This method is guaranteed to
+ work only for callback client invokers. For other, transport
+ specific, socket factory uses, the transport may or may not
+ use this information.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put the class name of a <classname>SocketFactory</classname>
+ in a configuration map, using key
+ <constant>Remoting.SOCKET_FACTORY_NAME</constant>, and pass the map
+ to one of the <classname>Connector</classname> constructors. In this
+ case, an instance of the class will be created using the default constructor.
+
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Put a set of SSL parameters, using the keys in
+ <classname>org.jboss.remoting.security.SSLSocketBuilder</classname>,
+ in a configuration map and pass the map to one of the
+ <classname>Connector</classname> constructors. These will be used by
+ <classname>SSLSocketBuilder</classname> to create a
+ <classname>CustomSSLSocketFactory</classname>.
+
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Configure an appropriate set of SSL system properties and use one of
+ the SSL transports (https, sslmultiplex, sslrmi, or sslsocket). The
+ properties will be used to create some kind of
+ <classname>SSLSocketFactory</classname>, as determined by the
+ transport.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Use one of the non-SSL transports and do nothing. Ordinary
+ <classname>Socket</classname>s will be used.
+ </para>
+ </listitem>
+ </orderedlist>
+
+ <para>Again, these are essentially in descending order of precedence.</para>
+ </section>
+
</section>
<section>
@@ -1171,6 +1360,42 @@
</section>
<section>
+ <title>SSL RMI Invoker</title>
+
+ <para>This is essentially identical to the RMI invoker, except that it
+ creates SSL socket and server socket factories by default.</para>
+
+ <para>
+ <emphasis role="bold">Note.</emphasis> Both the RMI and SSL RMI server
+ invokers create a socket factory and pass it to a client invoker along
+ with the RMI stub. Therefore, the socket factory must be serializable.
+ If the SSL RMI server invoker is allowed to create an
+ <classname>SSLSocketFactory</classname> from SSL parameters, it will take
+ care to create a serializable socket factory. However, if a socket factory
+ is passed in to the server invoker by one of the methods discussed earlier,
+ then the user is responsible for supplying a serializable socket
+ factory.</para>
+
+ <para>The rules discussed above for configuring socket and server socket
+ factories apply to the SSL RMI transport, but there is a twist, since the
+ server invoker creates the (client) socket factory and packages it with
+ its own stub. The server invoker creates a copy of
+ <classname>org.jboss.remoting.transport.rmi.ssl.SerializableSSLClientSocketFactory</classname>,
+ which is essentially just a holder for the configuration map passed to the
+ server invoker, with any parameters removed which concern trust store and
+ key store configuration. On the client side, when a client SSL RMI invoker
+ is created, it stores its own configuration map in a static variable which
+ the transferred <classname>SerializableSSLClientSocketFactory</classname>
+ can retrieve and merge with the configuration information it brought with
+ it from the server. In particular, if a socket factory is explicitly
+ passed to the client invoker, then
+ <classname>SerializableSSLClientSocketFactory</classname> will use it.
+ If not, then <classname>SerializableSSLClientSocketFactory</classname>
+ will use any key store and trust store information passed to the client
+ to create and configure a socket factory.</para>
+ </section>
+
+ <section>
<title>HTTP Invoker</title>
<para>The HTTP server invoker implementation is based on the Apache
@@ -1533,8 +1758,8 @@
<blockquote>
<para><ulink
- url="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossremoting">
- http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossremoting</ulink></para>
+ url="http://labs.jboss.com/portal/jbossremoting/docs/index.html">
+ http://labs.jboss.com/portal/jbossremoting/docs/index.html</ulink></para>
</blockquote>
<para>for further details.</para>
@@ -2297,17 +2522,25 @@
<title>Configuration properties</title>
<para>There are four categories of configuration properties
- supported by the multiplex invoker.</para>
+ supported by the multiplex invoker, the last three of which are specific
+ to the multiplex invoker. Properties in categories 2 and 3 may be
+ configured by appending them to the server's locator URI. Properties
+ in categories 2, 3, and 4 may be configured by putting their values
+ in a configuration <classname>HashMap</classname> and passing the map
+ to a <classname>MultiplexServerInvoker</classname> and/or
+ <classname>MultiplexClientInvoker</classname> constructor, according
+ to the category. Constants for the property names in categories
+ 2, 3, and 4 are found in
+ <classname>org.jboss.remoting.transport.multiplex.Multiplex</classname>.
+ Note that some of them are also found in the older
+ <classname>org.jboss.remoting.transport.multiplex.MultiplexInvokerConstants</classname>,
+ but the use of that class is now deprecated.
+ </para>
<orderedlist numeration="arabic">
- <listitem>
- <para>The following properties can be used to configure both
- master and virtual
- <classname>MultiplexorServerInvoker</classname>s. They can be
- set at any time, but will not take effect until the invoker is
- stopped and restarted. A subset of the parameters applicable to
- the socket invoker is currently implemented.</para>
-
+ <listitem>The following properties are managed by ancestor classes
+ of <classname>MultiplexServerInvoker</classname>. See the discussion
+ under <classname>SocketServerInvoker</classname> for more information.
<para><emphasis role="bold">socketTimeout</emphasis> - The
socket timeout value passed to the
<methodname>Socket.setSoTimeout()</methodname> method and the
@@ -2321,23 +2554,6 @@
<listitem>
<para>The following properties are intended to be passed to a
- <classname>MultiplexServerInvoker</classname> and then
- communicated to a corresponding
- <classname>MultiplexClientInvoker</classname> via parameters in
- the Locator URI. These configurations cannot be changed during
- runtime, so can only be set up upon initial configuration of the
- multiplex invoker on the server side. A subset of the parameters
- applicable to the socket invoker is currently
- implemented.</para>
-
- <para><emphasis role="bold">socketTimeout</emphasis> - The
- socket timeout value passed to the
- <methodname>Socket.setSoTimeout()</methodname> method. The
- default is 1800000 (or 30 minutes).</para>
- </listitem>
-
- <listitem>
- <para>The following properties are intended to be passed to a
virtual <classname>MultiplexServerInvoker</classname> to
configure its multiplex connection. These properties are
specific to the multiplex invoker.</para>
@@ -2355,6 +2571,14 @@
<classname>MultiplexServerInvoker</classname> with a
<classname>MultiplexClientInvoker</classname> with which it
should share a multiplex connection.</para>
+
+ <para><emphasis role="bold">multiplex.maxAcceptErrors</emphasis> -
+ Master and virtual <classname>MultiplexServerInvoker</classname>s
+ keep a counter of errors experienced by their server socket,
+ and they terminate when this maximum is exceeded. Note that
+ <classname>SSLHandshakeException</classname>s are excluded
+ from the count, since they could indicate a client rather
+ than server error.</para>
</listitem>
<listitem>
@@ -2377,9 +2601,48 @@
<classname>MultiplexServerInvoker</classname> with which it
should share a multiplex connection.</para>
</listitem>
+
+ <listitem>
+ <para>There is also a set of properties which are specific to
+ the Multiplex subsystem internal classes. See the Multiplex
+ documentation at</para>
+
+ <blockquote>
+ <para><ulink
+ url="http://labs.jboss.com/portal/jbossremoting/docs/index.html">
+ http://labs.jboss.com/portal/jbossremoting/docs/index.html</ulink></para>
+ </blockquote>
+
+ <para>for more information.</para>
+ </listitem>
</orderedlist>
</section>
</section>
+
+ <section>
+ <title>SSL Multiplex Invoker</title>
+
+ <para>This transport is essentially identical to the Multiplex transport,
+ except that it will create SSL socket factories and server socket factories
+ by default.</para>
+
+ <para>The twist to be found with the multiplex transport is that
+ virtual <classname>MultiplexServerInvoker</classname>s use a
+ <classname>VirtualServerSocket</classname>, which is based on a
+ client rather than a server socket, and consequently they act like
+ a client in some ways. In particular, a virtual
+ <classname>MultiplexServerInvoker</classname> will, in some cases, attempt
+ to connect to a remote master <classname>MultiplexServerInvoker</classname>,
+ for which it will need an actual client socket. All of the rules
+ for configuring socket factories apply to the
+ <classname>MultiplexServerInvoker</classname>, which calls the same
+ method that client invokers use to get a socket factory. Moreover,
+ if necessary, it will look for a
+ <classname>ServerSocketFactoryMBean</classname> to get SSL information
+ when configuring a socket factory.
+ </para>
+ </section>
+
</section>
<section>
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 06:51:24
|
User: starksm Date: 06/07/06 02:51:20 Added: src/resources/tests/xml deployer-beans.xml Log: A bootstrap deployer kernel beans descriptor Revision Changes Path 1.1 date: 2006/07/06 06:51:20; author: starksm; state: Exp;system2/src/resources/tests/xml/deployer-beans.xml Index: deployer-beans.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer"> <bean name="MainDeployer" class="org.jboss.deployers.plugins.MainDeployerImpl"> <!-- Should be VFSFactory, JBMICROCONT-95 --> <property name="vFSFactory"><inject bean="VFSFactory"/></property> </bean> <bean name="VFSFactory" class="org.jboss.vfs.file.DefaultVFSFactory"> </bean> </deployment> |
|
From: Scott S. <sco...@jb...> - 2006-07-06 06:49:44
|
User: starksm
Date: 06/07/06 02:49:41
Modified: src/main/org/jboss/system/server/profileservice
ServerImpl.java
Log:
Invoke run on the bootstrap
Revision Changes Path
1.2 +2 -1 system2/src/main/org/jboss/system/server/profileservice/ServerImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerImpl.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/server/profileservice/ServerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ServerImpl.java 6 Jul 2006 03:30:21 -0000 1.1
+++ ServerImpl.java 6 Jul 2006 06:49:41 -0000 1.2
@@ -320,6 +320,7 @@
log.info("Starting MicroContainer");
bootstrap = new ServerPSBootstrap(config.getServerName());
+ bootstrap.run();
// Install the shutdown hook
shutdownHook = new ShutdownHook(bootstrap);
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 06:19:39
|
User: starksm
Date: 06/07/06 02:19:37
Modified: src/tests/org/jboss/test/javabean/support SimpleBean.java
Log:
Add an upper case property to test JavaBean conventions
Revision Changes Path
1.2 +20 -0 microkernel/src/tests/org/jboss/test/javabean/support/SimpleBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SimpleBean.java
===================================================================
RCS file: /cvsroot/jboss/microkernel/src/tests/org/jboss/test/javabean/support/SimpleBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SimpleBean.java 29 Jan 2006 16:16:07 -0000 1.1
+++ SimpleBean.java 6 Jul 2006 06:19:37 -0000 1.2
@@ -29,7 +29,7 @@
* SimpleBean.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class SimpleBean
{
@@ -104,6 +104,8 @@
/** Overloaded property */
private String overloadedProperty;
+ private String xyz;
+ private String abc;
public SimpleBean()
{
@@ -354,4 +356,22 @@
{
throw new RuntimeException("Invoked the wrong setter");
}
+
+ public String getXYZ()
+ {
+ return xyz;
+ }
+ public void setXYZ(String xyz)
+ {
+ this.xyz = xyz;
+ }
+
+ public String getAbc()
+ {
+ return abc;
+ }
+ public void setAbc(String abc)
+ {
+ this.abc = abc;
+ }
}
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 06:19:16
|
User: starksm
Date: 06/07/06 02:19:14
Modified: src/tests/org/jboss/test/javabean/test
PropertyTestCase.java
Log:
Add an upper case property to test JavaBean conventions
Revision Changes Path
1.2 +24 -0 microkernel/src/tests/org/jboss/test/javabean/test/PropertyTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PropertyTestCase.java
===================================================================
RCS file: /cvsroot/jboss/microkernel/src/tests/org/jboss/test/javabean/test/PropertyTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PropertyTestCase.java 29 Jan 2006 16:16:06 -0000 1.1
+++ PropertyTestCase.java 6 Jul 2006 06:19:14 -0000 1.2
@@ -21,11 +21,15 @@
*/
package org.jboss.test.javabean.test;
+import java.beans.BeanInfo;
+import java.beans.PropertyDescriptor;
+import java.beans.Introspector;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import org.jboss.test.javabean.support.SimpleBean;
import org.jboss.util.NestedRuntimeException;
@@ -36,7 +40,7 @@
* PropertyTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PropertyTestCase extends AbstractJavaBeanTest
{
@@ -87,6 +91,26 @@
assertEquals(Long.class, number.getClass());
assertEquals(longValue, number);
assertEquals(stringValue, bean.getOverloadedProperty());
+ // An all uppercase property
+ assertEquals("XYZ", bean.getXYZ());
+ assertEquals("abc", bean.getAbc());
+ }
+
+ /**
+ * Validate the JavaBean property name introspection
+ * @throws Exception
+ */
+ public void testJavaBeanMatching() throws Exception
+ {
+ BeanInfo info = Introspector.getBeanInfo(SimpleBean.class);
+ PropertyDescriptor[] props = info.getPropertyDescriptors();
+ HashMap<String, PropertyDescriptor> propMap = new HashMap<String, PropertyDescriptor>();
+ for(PropertyDescriptor pd : props)
+ {
+ propMap.put(pd.getName(), pd);
+ }
+ assertNotNull("Has XYZ", propMap.get("XYZ"));
+ assertNull("Does not have xYZ", propMap.get("xYZ"));
}
protected Date createDate(String date)
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 06:17:13
|
User: starksm
Date: 06/07/06 02:17:10
Modified: src/resources/org/jboss/test/javabean/test
TestConfigure.xml
Log:
Add an upper case property to test JavaBean conventions
Revision Changes Path
1.2 +2 -0 microkernel/src/resources/org/jboss/test/javabean/test/TestConfigure.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TestConfigure.xml
===================================================================
RCS file: /cvsroot/jboss/microkernel/src/resources/org/jboss/test/javabean/test/TestConfigure.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TestConfigure.xml 29 Jan 2006 16:16:06 -0000 1.1
+++ TestConfigure.xml 6 Jul 2006 06:17:10 -0000 1.2
@@ -21,4 +21,6 @@
<property name="adouble">3.14e12</property>
<property name="aNumber" class="java.lang.Long">12345</property>
<property name="overloadedProperty">StringValue</property>
+ <property name="XYZ">XYZ</property>
+ <property name="abc">abc</property>
</javabean>
|
|
From: Ron S. <ron...@ya...> - 2006-07-06 06:10:25
|
User: rsigal
Date: 06/07/06 02:10:24
Modified: src/main/org/jboss/remoting/transport/multiplex
Multiplex.java
Log:
JBREM-390: Just reordered a couple of constants. Purely cosmetic.
Revision Changes Path
1.5 +1 -1 JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/Multiplex.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Multiplex.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/Multiplex.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Multiplex.java 25 Jun 2006 19:02:12 -0000 1.4
+++ Multiplex.java 6 Jul 2006 06:10:24 -0000 1.5
@@ -48,9 +48,9 @@
public static final String SERVER_MULTIPLEX_ID = "serverMultiplexId";
public static final String CLIENT_MULTIPLEX_ID = "clientMultiplexId";
public static final String MULTIPLEX_CONNECT_PORT = "multiplexConnectPort";
+ public static final String MULTIPLEX_CONNECT_HOST = "multiplexConnectHost";
public static final String MULTIPLEX_BIND_HOST = "multiplexBindHost";
public static final String MULTIPLEX_BIND_PORT = "multiplexBindPort";
- public static final String MULTIPLEX_CONNECT_HOST = "multiplexConnectHost";
public static final String MAX_ACCEPT_ERRORS = "multiplex.maxAcceptErrors";
// defaults:
|
|
From: Ron S. <ron...@ya...> - 2006-07-06 06:07:37
|
User: rsigal
Date: 06/07/06 02:07:34
Modified: src/main/org/jboss/remoting/transport/rmi
RemotingRMIClientSocketFactory.java
Log:
JBREM-513: Made SocketFactory transient.
Revision Changes Path
1.8 +2 -2 JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemotingRMIClientSocketFactory.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- RemotingRMIClientSocketFactory.java 5 Jul 2006 17:01:48 -0000 1.7
+++ RemotingRMIClientSocketFactory.java 6 Jul 2006 06:07:34 -0000 1.8
@@ -55,7 +55,7 @@
* with localhost will allow the retrieval of objects bound to localhost.
*
* @author <a href="mailto:r....@co...">Ron Sigal</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
* <p/>
* Copyright (c) 2005
* </p>
@@ -63,7 +63,7 @@
public class RemotingRMIClientSocketFactory implements RMIClientSocketFactory, Serializable
{
- protected SocketFactory socketFactory;
+ transient protected SocketFactory socketFactory;
private int timeout = 60000;
// The commented code below is from an attempt to incorporate a <code>java.lang.reflect.Constructor</code>
|
|
From: Ron S. <ron...@ya...> - 2006-07-06 05:50:12
|
User: rsigal
Date: 06/07/06 01:50:09
Modified: src/main/org/jboss/remoting/transport/rmi/ssl
SSLRMIClientInvoker.java
Log:
JBREM-513: Create new copy of configuration HashMap before putting into SerializableSSLClientSocketFactory static map.
Revision Changes Path
1.2 +6 -3 JBossRemoting/src/main/org/jboss/remoting/transport/rmi/ssl/SSLRMIClientInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SSLRMIClientInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/ssl/SSLRMIClientInvoker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SSLRMIClientInvoker.java 20 Jun 2006 16:34:40 -0000 1.1
+++ SSLRMIClientInvoker.java 6 Jul 2006 05:50:09 -0000 1.2
@@ -22,6 +22,7 @@
package org.jboss.remoting.transport.rmi.ssl;
+import java.util.HashMap;
import java.util.Map;
import org.jboss.remoting.ConnectionFailedException;
@@ -33,7 +34,7 @@
/**
*
* @author <a href="mailto:ron...@jb...">Ron Sigal</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* <p>
* Copyright (c) Jun 11, 2006
* </p>
@@ -53,15 +54,17 @@
protected void handleConnect() throws ConnectionFailedException
{
+ HashMap localConfig = new HashMap(configuration);
+
// If a specific SocketFactory was passed in, use it. If a SocketFactory was
// generated from SSL parameters, discard it. It will be recreated later by
// SerializableSSLClientSocketFactory with any additional parameters sent
// from server.
if (socketFactory != null && !socketFactoryCreatedFromSSLParameters)
- configuration.put(Remoting.CUSTOM_SOCKET_FACTORY, socketFactory);
+ localConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, socketFactory);
- // Save configuration for SerializationSSLClientSocketFactory.
- SerializableSSLClientSocketFactory.addLocalConfiguration(locator, configuration);
+ // Save configuration for SerializableSSLClientSocketFactory.
+ SerializableSSLClientSocketFactory.addLocalConfiguration(locator, localConfig);
super.handleConnect();
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-06 05:48:39
|
User: bwang
Date: 06/07/06 01:48:37
Modified: src-50/org/jboss/cache/pojo/interceptors
PojoTxLockInterceptor.java
Log:
Exposed getLockWoner API
Revision Changes Path
1.2 +2 -2 JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTxLockInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PojoTxLockInterceptor.java 6 Jul 2006 02:42:35 -0000 1.1
+++ PojoTxLockInterceptor.java 6 Jul 2006 05:48:37 -0000 1.2
@@ -17,7 +17,7 @@
/** Interceptor that handles the parent node lock associated with transaction.
*
* @author Ben Wang
- * @version $Id: PojoTxLockInterceptor.java,v 1.1 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: PojoTxLockInterceptor.java,v 1.2 2006/07/06 05:48:37 bwang Exp $
*/
public class PojoTxLockInterceptor extends AbstractInterceptor
{
@@ -39,7 +39,7 @@
{
String id = (String)invocation.getArguments()[0];
PojoTreeCache cache = getCache(invocation);
- Object owner = cache.getOwnerForLock();
+ Object owner = cache.getLockOwner();
if (!lockPojo(owner, id, cache))
{
throw new PojoCacheException("PojoCache.removeObject(): Can't obtain the pojo lock under id: " + id);
|
|
From: Ben W. <bw...@jb...> - 2006-07-06 05:48:39
|
User: bwang
Date: 06/07/06 01:48:37
Modified: src-50/org/jboss/cache/pojo PojoTreeCache.java
Log:
Exposed getLockWoner API
Revision Changes Path
1.4 +4 -0 JBossCache/src-50/org/jboss/cache/pojo/PojoTreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/PojoTreeCache.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PojoTreeCache.java 6 Jul 2006 04:11:17 -0000 1.3
+++ PojoTreeCache.java 6 Jul 2006 05:48:37 -0000 1.4
@@ -421,6 +421,10 @@
return marshallNonSerializable_;
}
+ public Object getLockOwner()
+ {
+ return getOwnerForLock();
+ }
/**
* Inject the config element that is specific to PojoCache.
|
|
From: Ron S. <ron...@ya...> - 2006-07-06 05:45:03
|
User: rsigal
Date: 06/07/06 01:45:01
Modified: src/main/org/jboss/remoting/transport/rmi/ssl
SerializableSSLClientSocketFactory.java
Log:
JBREM-513: Keep local configuration, which may have non serializable factories, separate from configuration, which is mean to contain only serializable objects.
Revision Changes Path
1.2 +8 -8 JBossRemoting/src/main/org/jboss/remoting/transport/rmi/ssl/SerializableSSLClientSocketFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SerializableSSLClientSocketFactory.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/ssl/SerializableSSLClientSocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SerializableSSLClientSocketFactory.java 20 Jun 2006 16:34:40 -0000 1.1
+++ SerializableSSLClientSocketFactory.java 6 Jul 2006 05:45:01 -0000 1.2
@@ -42,7 +42,7 @@
/**
*
* @author <a href="mailto:ron...@jb...">Ron Sigal</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* <p>
* Copyright (c) Jun 9, 2006
* </p>
@@ -69,10 +69,6 @@
Map configuration)
{
super(null, invokerLocator.getHost(), timeout);
-
- if (socketFactory != null)
- socketFactories.put(this, socketFactory);
-
this.invokerLocator = invokerLocator;
this.configuration = new HashMap(configuration);
}
@@ -91,17 +87,21 @@
{
try
{
+ // We want to keep the local configuration map, which might contain a
+ // SocketFactory, separate from the configuration map, which is meant
+ // to contain only serializable objects.
+ Map tempConfig = new HashMap(configuration);
Map localConfig = (Map) configMaps.get(holder);
if (localConfig != null)
- configuration.putAll(localConfig);
+ tempConfig.putAll(localConfig);
- if (configuration.containsKey(Remoting.CUSTOM_SOCKET_FACTORY))
+ if (tempConfig.containsKey(Remoting.CUSTOM_SOCKET_FACTORY))
{
- socketFactory = (SocketFactory) configuration.get(Remoting.CUSTOM_SOCKET_FACTORY);
+ socketFactory = (SocketFactory) tempConfig.get(Remoting.CUSTOM_SOCKET_FACTORY);
}
else
{
- SSLSocketBuilder socketBuilder = new SSLSocketBuilder(configuration);
+ SSLSocketBuilder socketBuilder = new SSLSocketBuilder(tempConfig);
socketBuilder.setUseSSLSocketFactory( false );
socketFactory = socketBuilder.createSSLSocketFactory();
}
|
|
From: <for...@jb...> - 2006-07-06 05:01:33
|
Commit from wolfc (2006-07-05 03:31 EDT) ----------------- EJBTHREE-626 jboss-ejb3 src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java 1.22 Commit from hbraun (2006-07-05 03:54 EDT) ------------------ *** empty log message *** repository.jboss.com jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar 1.14 Commit from wolfc (2006-07-05 04:45 EDT) ----------------- EJBTHREE-485: proxy generation refactored jboss-ejb3 build-test.xml 1.214 jboss-ejb3 build.xml 1.85 jboss-ejb3 src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java 1.2 + jboss-ejb3 src/main/org/jboss/ejb3/stateless/JavassistProxy.java 1.1 jboss-ejb3 src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java 1.21 + jboss-ejb3 src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java 1.1 jboss-ejb3 src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 1.14 jboss-ejb3 src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java 1.9 jboss-ejb3 src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java 1.12 jboss-ejb3 src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java 1.2 Commit from wolfc (2006-07-05 04:52 EDT) ----------------- merge failure resolved jboss-ejb3 build-test.xml 1.215 Commit from alesj (2006-07-05 05:17 EDT) ----------------- Adding new IntelliJ Idea modules. + jboss-portal build/ide/intellij/idea50/modules/thirdparty/thirdparty.iml 1.1 + jboss-portal build/ide/intellij/idea50/modules/tools/tools.iml 1.1 Commit from smarlow (2006-07-05 06:38 EDT) ------------------- just noticed that I missed the closing tag with my previous change. JBossCache docs/PojoCache/en/modules/architecture.xml 1.4 Commit from smarlow (2006-07-05 06:39 EDT) ------------------- one more correction. JBossCache docs/PojoCache/en/modules/architecture.xml 1.5 Commit from wolfc (2006-07-05 06:51 EDT) ----------------- EJBTHREE-620: added java.ejb.EJB.beanInterface jboss-ejb3x src/main/javax/ejb/EJB.java 1.5 + jboss-ejb3 src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java 1.1 jboss-ejb3 build-test.xml 1.216 + jboss-ejb3 src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java 1.1 + jboss-ejb3 src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java 1.1 jboss-ejb3 src/main/org/jboss/ejb3/injection/EJBHandler.java 1.36 Commit from dimitris (2006-07-05 07:04 EDT) -------------------- JBAS-3367, guard against NPE in unregisterClassloader() jboss-system src/main/org/jboss/deployment/SimpleSubDeployerSupport.java 1.13 Commit from dimitris on branch Branch_4_0 (2006-07-05 07:05 EDT) ----------------------------------------- JBAS-3367, guard against NPE in unregisterClassloader() jboss-system src/main/org/jboss/deployment/SimpleSubDeployerSupport.java 1.6.2.7 Commit from julien (2006-07-05 07:27 EDT) ------------------ updated distribution build (only missing ilcence packaging) jboss-portal build/distrib.xml 1.18 Commit from kkhan (2006-07-05 08:18 EDT) ----------------- [JBAOP-270] Add invokeTarget() method to Invocation. This is similar to invokeNext() but skips the remainder of the interceptor chain and invokes the target joinpoint jboss-aop src/main/org/jboss/aop/joinpoint/ConstructorInvocation.java 1.24 jboss-aop src/main/org/jboss/aop/joinpoint/MethodInvocation.java 1.43 jboss-aop src/main/org/jboss/aop/joinpoint/MethodCalledByMethodInvocation.java 1.19 jboss-aop src/main/org/jboss/aop/joinpoint/ConstructionInvocation.java 1.10 jboss-aop src/main/org/jboss/aop/joinpoint/FieldWriteInvocation.java 1.17 jboss-aop src/main/org/jboss/aop/joinpoint/ConstructorCalledByMethodInvocation.java 1.23 jboss-aop src/main/org/jboss/aop/joinpoint/FieldReadInvocation.java 1.16 jboss-aop src/main/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java 1.19 jboss-aop src/main/org/jboss/aop/joinpoint/Invocation.java 1.18 jboss-aop src/main/org/jboss/aop/joinpoint/InvocationBase.java 1.12 jboss-aop src/main/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java 1.16 jboss-aop src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java 1.15 jboss-aop src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java 1.16 jboss-aop src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java 1.16 jboss-aop src/main/org/jboss/aop/instrument/JoinPointGenerator.java 1.28 jboss-aop src/main/org/jboss/aop/instrument/OptimizedFieldInvocations.java 1.4 jboss-aop src/main/org/jboss/aop/instrument/OptimizedConstructorInvocations.java 1.8 jboss-aop src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java 1.17 jboss-aop src/main/org/jboss/aop/instrument/OptimizedConstructionInvocations.java 1.6 jboss-aop src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java 1.7 jboss-aop src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java 1.17 jboss-aop src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java 1.15 jboss-aop src/main/org/jboss/aop/instrument/OptimizedMethodInvocations.java 1.9 jboss-aop src/main/org/jboss/aop/instrument/OptimizedInvocations.java 1.5 jboss-aop src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java 1.14 + jboss-aop src/test/org/jboss/test/aop/invoketarget/InvokeTargetTestCase.java 1.1 + jboss-aop src/test/org/jboss/test/aop/invoketarget/CountingInterceptor.java 1.1 + jboss-aop src/test/org/jboss/test/aop/invoketarget/BypassInterceptor.java 1.1 + jboss-aop src/test/org/jboss/test/aop/invoketarget/CalledPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/invoketarget/CallingPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/invoketarget/POJO.java 1.1 jboss-aop build.xml 1.151 + jboss-aop src/resources/test/invoketarget/jboss-aop.xml 1.1 Commit from aloubyansky (2006-07-05 10:08 EDT) ----------------------- more tests for QName's jbosstest src/main/org/jboss/test/xml/BasicArraysUnitTestCase.java 1.10 jbosstest src/main/org/jboss/test/xml/QNameAttributesUnitTestCase.java 1.3 Commit from dlofthouse on branch JBoss_4_0_3_SP1_JBAS-3365 (2006-07-05 10:12 EDT) ---------------------------------------------------------- JBAS-3365 - Extended XMLLoginConfig MBean to allow runtime modifications to the configuration. jbosssx src/main/org/jboss/security/auth/login/XMLLoginConfigMBean.java 1.5.6.2.54.1 jbosssx src/main/org/jboss/security/auth/login/XMLLoginConfig.java 1.9.6.2.54.1 Commit from kkhan on branch Branch_4_0 (2006-07-05 10:23 EDT) -------------------------------------- [JBAOP-95] Isolate caller from permission checks jboss-aspects src/main/org/jboss/aspects/security/SecurityContext.java 1.2.2.9 jboss-aspects src/main/org/jboss/aspects/security/SecurityClientInterceptor.java 1.3.2.10 jboss-aspects src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptor.java 1.4.2.9 jboss-aspects src/main/org/jboss/aspects/security/SecurityActions.java 1.2.2.11 jboss-aspects src/main/org/jboss/aspects/security/AuthenticationInterceptor.java 1.4.2.12 jboss-aspects build.xml 1.13.2.26 Commit from kkhan (2006-07-05 10:25 EDT) ----------------- [JBAOP-95] Isolate caller from permission checks jboss-aspects src/main/org/jboss/aspects/security/SecurityContext.java 1.5 jboss-aspects src/main/org/jboss/aspects/security/SecurityClientInterceptor.java 1.6 jboss-aspects src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptor.java 1.8 jboss-aspects src/main/org/jboss/aspects/security/AuthenticationInterceptor.java 1.14 jboss-aspects src/main/org/jboss/aspects/security/SecurityActions.java 1.6 jboss-aspects build.xml 1.58 Commit from telrod (2006-07-05 10:34 EDT) ------------------ JBREM-494 - added serialVersionUID JBossRemoting src/main/org/jboss/remoting/ClientDisconnectedException.java 1.2 Commit from rgenova (2006-07-05 11:01 EDT) ------------------- fixed some issues with jars on the classpath jboss-portal migration/build.xml 1.20 Commit from bela on branch Branch_JBossCache_1_3_0 (2006-07-05 11:19 EDT) -------------------------------------------------- replaced Boolean.parseBoolean() with new Boolean(str).booleanValue(). The former is JDK 5 specific JBossCache tests/perf/org/jboss/cache/Server.java 1.22.2.2 Commit from kkhan (2006-07-05 11:42 EDT) ----------------- [JBAOP-264] Field names like "_test" caused errors + jboss-aop src/test/org/jboss/test/aop/regression/jbaop264underscorefieldname/POJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/regression/jbaop264underscorefieldname/UnderscoreInFieldNameTestCase.java 1.1 + jboss-aop src/test/org/jboss/test/aop/regression/jbaop264underscorefieldname/TestAspect.java 1.1 jboss-aop src/resources/test/regression/jboss-aop.xml 1.16 jboss-aop src/main/org/jboss/aop/ClassAdvisor.java 1.154 jboss-aop src/main/org/jboss/aop/ClassContainer.java 1.30 Commit from kkhan on branch Branch_AOP_1_5 (2006-07-05 11:46 EDT) ------------------------------------------ [JBAOP-264] Fields with names like "_test" caused errors + jboss-aop src/test/org/jboss/test/aop/regression/jbaop264underscorefieldname/POJO.java 1.1.2.2 + jboss-aop src/test/org/jboss/test/aop/regression/jbaop264underscorefieldname/UnderscoreInFieldNameTestCase.java 1.1.2.2 + jboss-aop src/test/org/jboss/test/aop/regression/jbaop264underscorefieldname/TestAspect.java 1.1.2.2 jboss-aop src/resources/test/regression/jboss-aop.xml 1.14.4.1 jboss-aop src/main/org/jboss/aop/ClassAdvisor.java 1.146.2.1 Commit from bela on branch Branch_JBossCache_1_3_0 (2006-07-05 12:03 EDT) -------------------------------------------------- added call to createService() JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.1.2.2 Commit from rrajasekaran (2006-07-05 12:08 EDT) ------------------------ Remove CVS checkout dirs created by the build tools etc/cruisecontrol/scripts/build-jboss-seam-testsuite.xml 1.9 Commit from bela on branch Branch_JBossCache_1_3_0 (2006-07-05 12:12 EDT) -------------------------------------------------- tearDown() was not called because of incorrect signature JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.1.2.3 Commit from aloubyansky (2006-07-05 12:21 EDT) ----------------------- latest snapshot repository.jboss.com jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar 1.15 Commit from rgenova (2006-07-05 12:22 EDT) ------------------- added readme file for the clustering distro + jboss-portal-docs readmeFiles/jboss-portal-ha-bin.README 1.1 Commit from rrajasekaran (2006-07-05 12:23 EDT) ------------------------ Removed jms-head-testsuite tools etc/cruisecontrol/templates/projects.xml 1.70 Commit from rrajasekaran (2006-07-05 12:24 EDT) ------------------------ Added jms-head-testsuite tools etc/cruisecontrol/templates/projects-matrix.xml 1.7 Commit from kkhan (2006-07-05 12:33 EDT) ----------------- Tidy up aop-mc-int src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 1.11 Commit from telrod (2006-07-05 12:35 EDT) ------------------ JBREM-517 - depricated class as is being replaced by CoyoteInvoker. JBossRemoting src/main/org/jboss/remoting/transport/http/HTTPServerInvoker.java 1.26 Commit from rgenova (2006-07-05 12:46 EDT) ------------------- updated thirdparty licenses and ha readme file jboss-portal build/distrib.xml 1.19 Commit from julien (2006-07-05 12:47 EDT) ------------------ only set the req charset encoding if the request is POST + content type == application/x-www-form-urlencoded : i.e the servlet container takes care of parsing the body of the request jboss-portal server/src/main/org/jboss/portal/server/PortalConstants.java 1.18 jboss-portal server/src/main/org/jboss/portal/server/servlet/PortalServlet.java 1.23 Commit from telrod (2006-07-05 12:51 EDT) ------------------ JBREM-454 - socket class implementation caching added. JBossRemoting src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 1.10 JBossRemoting src/main/org/jboss/remoting/transport/socket/ServerThread.java 1.26 JBossRemoting src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java 1.37 Commit from julien (2006-07-05 12:58 EDT) ------------------ updating version ### jboss-portal server/src/main/org/jboss/portal/server/PortalConstants.java 1.19 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-05 13:00 EDT) ------------------------------------------------------ Fixed JBCACHE-668 and JBCACHE-682 JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.1.2.4 JBossCache src/org/jboss/cache/interceptors/TxInterceptor.java 1.35.2.4 Commit from telrod (2006-07-05 13:01 EDT) ------------------ JBREM-495 - adding serial version uid JBossRemoting src/main/org/jboss/remoting/callback/HandleCallbackException.java 1.4 JBossRemoting src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java 1.6 JBossRemoting src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java 1.6 JBossRemoting src/main/org/jboss/remoting/marshal/InvalidMarshallingResource.java 1.4 JBossRemoting src/main/org/jboss/remoting/network/NetworkRegistryQuery.java 1.4 JBossRemoting src/main/org/jboss/remoting/serialization/impl/jboss/LocalMarshalledValue.java 1.8 JBossRemoting src/main/org/jboss/remoting/transport/coyote/ClientAbortException.java 1.4 JBossRemoting src/main/org/jboss/remoting/transport/multiplex/MasterServerSocket.java 1.8 JBossRemoting src/main/org/jboss/remoting/transport/multiplex/SocketId.java 1.23 JBossRemoting src/main/org/jboss/remoting/transport/multiplex/VirtualServerSocket.java 1.10 JBossRemoting src/main/org/jboss/remoting/transport/multiplex/VirtualSocketFactory.java 1.6 JBossRemoting src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java 1.7 JBossRemoting src/main/org/jboss/remoting/transport/rmi/RemotingRMIServerSocketFactory.java 1.5 JBossRemoting src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java 1.5 JBossRemoting src/main/org/jboss/remoting/transporter/TransporterClient.java 1.11 JBossRemoting src/main/org/jboss/remoting/CannotConnectException.java 1.3 JBossRemoting src/main/org/jboss/remoting/InvalidConfigurationException.java 1.3 JBossRemoting src/main/org/jboss/remoting/SubsystemNotSupported.java 1.4 Commit from telrod (2006-07-05 13:09 EDT) ------------------ JBREM-447 - adding to javadoc note that transporter server will have already been started upon return to the static create methods. JBossRemoting src/main/org/jboss/remoting/transporter/TransporterServer.java 1.12 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-05 13:18 EDT) ------------------------------------------------------ Fixed JBCACHE-661 JBossCache src/org/jboss/cache/interceptors/BaseCacheLoaderInterceptor.java 1.1.2.2 Commit from russo (2006-07-05 13:18 EDT) ----------------- - fix bad table naming for repositoryentry jboss-portal core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 1.35 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-05 13:29 EDT) ------------------------------------------------------ preparing for a 1.3.0.SP3 release JBossCache docs/Changelog.txt 1.15.2.3 JBossCache src/org/jboss/cache/Version.java 1.13.2.3 JBossCache build.xml 1.95.2.4 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-05 13:44 EDT) ------------------------------------------------------ Included JBCACHE-665 in the test suite JBossCache build.xml 1.95.2.5 Commit from telrod (2006-07-05 13:48 EDT) ------------------ JBREM-533 - removing GET test case. JBossRemoting src/tests/org/jboss/test/remoting/transport/http/HTTPInvokerClientTestCase.java 1.9 Commit from asaldhana (2006-07-05 14:26 EDT) --------------------- JBAS-2661: EJB context isCallerInRole not delegating to JACC when installed jboss src/main/org/jboss/ejb/Container.java 1.179 jboss src/main/org/jboss/ejb/EnterpriseContext.java 1.87 jboss src/main/org/jboss/ejb/SecurityActions.java 1.9 jboss src/main/org/jboss/ejb/plugins/JaccAuthorizationInterceptor.java 1.7 Commit from asaldhana (2006-07-05 14:30 EDT) --------------------- JBAS-2661: Tests updated for " EJB context isCallerInRole not delegating to JACC when installed" + jbosstest src/main/org/jboss/test/jacc/test/CallerInRoleUnitTestCase.java 1.2 jbosstest src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java 1.3 jbosstest src/main/org/jboss/test/jacc/test/WebIntegrationUnitTestCase.java 1.3 Commit from asaldhana (2006-07-05 14:31 EDT) --------------------- JBAS-2661: EJB context isCallerInRole not delegating to JACC when installed jbosstest imports/sections/security.xml 1.7 + jbosstest src/main/org/jboss/test/security/ejb/UsefulStatelessSessionBean.java 1.2 + jbosstest src/main/org/jboss/test/security/interfaces/UsefulStatelessSession.java 1.2 + jbosstest src/main/org/jboss/test/security/interfaces/UsefulStatelessSessionHome.java 1.2 + jbosstest src/resources/security/jacc/callerInRole/roles.properties 1.2 + jbosstest src/resources/security/jacc/callerInRole/users.properties 1.2 + jbosstest src/resources/security/jacc/callerInRole/META-INF/ejb-jar.xml 1.2 + jbosstest src/resources/security/jacc/callerInRole/META-INF/jboss.xml 1.2 Commit from asaldhana (2006-07-05 14:55 EDT) --------------------- JBAS-2657: Deep Copy of authenticated subject sets jbosssx src/main/org/jboss/security/NestableGroup.java 1.9 jbosssx src/main/org/jboss/security/NestablePrincipal.java 1.4 jbosssx src/main/org/jboss/security/RunAsIdentity.java 1.4 jbosssx src/main/org/jboss/security/SimpleGroup.java 1.7 Commit from asaldhana (2006-07-05 14:59 EDT) --------------------- JBAS-2657: Deep copy subject sets (port to HEAD) jbosstest imports/sections/security.xml 1.8 + jbosstest src/main/org/jboss/test/security/test/DeepCopySubjectUnitTestCase.java 1.2 + jbosstest src/main/org/jboss/test/security/servlets/DeepCopySubjectServlet.java 1.2 + jbosstest src/resources/security/deepcopy/readme.txt 1.2 + jbosstest src/resources/security/deepcopy/META-INF/application.xml 1.2 + jbosstest src/resources/security/deepcopy/META-INF/deepcopy-config.xml 1.2 + jbosstest src/resources/security/deepcopy/META-INF/deepcopy-service.xml 1.2 + jbosstest src/resources/security/deepcopy/META-INF/jboss-app.xml 1.2 + jbosstest src/resources/security/deepcopy/WEB-INF/jboss-web.xml 1.2 + jbosstest src/resources/security/deepcopy/WEB-INF/web.xml 1.2 Commit from russo (2006-07-05 16:17 EDT) ----------------- JBPORTAL-928 - updated links to pswap jboss-portal-docs referenceGuide/en/modules/tutorials.xml 1.10 Commit from csuconic (2006-07-05 17:04 EDT) -------------------- Adding Resultset as Proxied jboss-profiler java/src/proxyDriver/org/jboss/profiler/proxydriver/core/ProxyStatement.java 1.3 jboss-profiler java/src/proxyDriver/org/jboss/profiler/proxydriver/core/ProxyPreparedStatement.java 1.3 jboss-profiler java/src/proxyDriver/org/jboss/profiler/proxydriver/core/JDBCCallback.java 1.2 jboss-profiler java/src/proxyDriver/org/jboss/profiler/proxydriver/core/JDBCCallbackImpl.java 1.3 + jboss-profiler java/src/proxyDriver/org/jboss/profiler/proxydriver/core/ProxyResultset.java 1.1 Commit from csuconic (2006-07-05 17:04 EDT) -------------------- Adding tests jboss-profiler java/src/tests/org/jboss/profiler/proxydriver/TestDriver.java 1.5 Commit from telrod (2006-07-05 17:12 EDT) ------------------ JBREM-427 - updated tests so can run via IDE JBossRemoting src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestClient.java 1.3 JBossRemoting src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestServer.java 1.3 Commit from kkhan (2006-07-05 17:23 EDT) ----------------- [JBAOP-271] Link TODO to jira issue aop-mc-int src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataFactory.java 1.3 Commit from telrod (2006-07-05 17:24 EDT) ------------------ JBREM-302 - adding marshalling tests back in JBossRemoting build.xml 1.62 Commit from bdecoste (2006-07-05 17:27 EDT) -------------------- added aspects classpath to test classpath jboss-ejb3 build-test.xml 1.217 Commit from asaldhana on branch Branch_4_0 (2006-07-05 18:29 EDT) ------------------------------------------ JBAS-3210: Testcase and resources for "DynamicLoginConfig service fails to load login-config.xml that may be absolute" jbosstest imports/sections/jmx.xml 1.1.2.11 + jbosstest src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java 1.1.4.2 + jbosstest src/main/org/jboss/test/jmx/mbean/TempFileCreatorService.java 1.1.2.1 + jbosstest src/main/org/jboss/test/jmx/mbean/TempFileCreatorServiceMBean.java 1.1.2.1 + jbosstest src/resources/jmx/tempFileCreator-service.xml 1.1.2.1 + jbosstest src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml 1.1.4.2 Commit from asaldhana (2006-07-05 18:45 EDT) --------------------- JBAS-3210: Testcase and resources for "DynamicLoginConfig service fails to load login-config.xml that may be absolute" jbosstest imports/sections/jmx.xml 1.11 + jbosstest src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java 1.2 + jbosstest src/main/org/jboss/test/jmx/mbean/TempFileCreatorService.java 1.2 + jbosstest src/main/org/jboss/test/jmx/mbean/TempFileCreatorServiceMBean.java 1.2 + jbosstest src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml 1.2 + jbosstest src/resources/jmx/tempFileCreator-service.xml 1.2 Commit from csuconic (2006-07-05 18:59 EDT) -------------------- fixing classPath jboss-serialization .classpath 1.11 Commit from starksm (2006-07-05 19:57 EDT) ------------------- Remove obsolete netboot files - system2 src/main/org/jboss/deployment/NetBootHelper.java 1.2 - system2 src/main/org/jboss/deployment/NetBootFile.java 1.2 Commit from starksm (2006-07-05 20:09 EDT) ------------------- Remove obsolete netboot files - system2 src/main/org/jboss/deployment/scanner/HttpURLDeploymentScannerMBean.java 1.2 - system2 src/main/org/jboss/deployment/scanner/HttpURLDeploymentScanner.java 1.2 Commit from asogor (2006-07-05 22:28 EDT) ------------------ moved a queue jboss-mail src/GRAPHICAL/templates/calendar.ear/calendarjmx.sar/META-INF/jboss-service.xml.vm 1.3 jboss-mail src/GRAPHICAL/templates/mail.ear/mail.sar/META-INF/jboss-service.xml.vm 1.45 Commit from asogor (2006-07-05 22:31 EDT) ------------------ handle inivte responses jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/session/AddressManagerBean.java 1.6 + jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/MailResposeHandlerMDB.java 1.1 + jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus/InviteResponse.java 1.1 Commit from bwang (2006-07-05 22:42 EDT) ----------------- First cut of PojoCache 2.0 interceptor stack via aop. JBossCache src-50/org/jboss/cache/pojo/annotation/CheckIdValidity.java 1.2 + JBossCache src-50/org/jboss/cache/pojo/annotation/Tx.java 1.1 JBossCache src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java 1.5 + JBossCache src-50/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java 1.1 JBossCache src-50/org/jboss/cache/pojo/interceptors/CheckIdInterceptor.java 1.2 + JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoBeginInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoEventInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxUndoInterceptor.java 1.1 JBossCache src-50/org/jboss/cache/pojo/CollectionClassHandler.java 1.4 JBossCache src-50/org/jboss/cache/pojo/ModificationEntry.java 1.3 JBossCache src-50/org/jboss/cache/pojo/PojoTreeCache.java 1.2 JBossCache src-50/org/jboss/cache/pojo/PojoTxSynchronizationHandler.java 1.4 + JBossCache src-50/org/jboss/cache/pojo/PojoUtil.java 1.1 JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.4 JBossCache src/resources/jboss-aop.xml 1.7 Commit from telrod (2006-07-05 23:01 EDT) ------------------ JBREM-302 - adding marshalling tests back in JBossRemoting build.xml 1.63 Commit from telrod (2006-07-05 23:12 EDT) ------------------ Changed the setting of jboss.identity to be back to using current timestamp instead of static directory. JBossRemoting src/tests/org/jboss/test/remoting/detection/multicast/MulticastUnitTestCase.java 1.7 Commit from starksm (2006-07-05 23:26 EDT) ------------------- Handle a missing version.properties system2 src/main/org/jboss/Version.java 1.2 Commit from starksm (2006-07-05 23:27 EDT) ------------------- Move the profileservice spi into the server module + system2 src/main/org/jboss/profileservice/spi/NoSuchDeploymentException.java 1.1 + system2 src/main/org/jboss/profileservice/spi/DeploymentTemplate.java 1.1 + system2 src/main/org/jboss/profileservice/spi/SimpleType.java 1.1 + system2 src/main/org/jboss/profileservice/spi/NoSuchProfileException.java 1.1 + system2 src/main/org/jboss/profileservice/spi/ProfileService.java 1.1 + system2 src/main/org/jboss/profileservice/spi/OpenType.java 1.1 + system2 src/main/org/jboss/profileservice/spi/ArrayType.java 1.1 + system2 src/main/org/jboss/profileservice/spi/ProfileKey.java 1.1 + system2 src/main/org/jboss/profileservice/spi/CompositeData.java 1.1 + system2 src/main/org/jboss/profileservice/spi/CompositeType.java 1.1 + system2 src/main/org/jboss/profileservice/spi/PropertyInfo.java 1.1 + system2 src/main/org/jboss/profileservice/spi/Profile.java 1.1 + system2 src/main/org/jboss/profileservice/spi/ProfileConfiguration.java 1.1 + system2 src/main/org/jboss/deployers/spi/management/ManagementView.java 1.1 + system2 src/main/org/jboss/deployers/spi/management/ManagedObject.java 1.1 + system2 src/main/org/jboss/deployers/spi/management/ManagedPropertyRef.java 1.1 Commit from starksm (2006-07-05 23:27 EDT) ------------------- Use the profileservice ManagedObject system2 src/main/org/jboss/deployers/spi/Deployment.java 1.3 system2 src/main/org/jboss/deployers/spi/MainDeployer.java 1.4 system2 src/main/org/jboss/deployers/plugins/DeploymentImpl.java 1.3 Commit from starksm (2006-07-05 23:28 EDT) ------------------- Add a shutdown method to undeploy all deployments system2 src/main/org/jboss/deployers/plugins/MainDeployerImpl.java 1.2 Commit from starksm (2006-07-05 23:29 EDT) ------------------- Use the profileservice loader by default system2 src/main/org/jboss/system/server/ServerLoader.java 1.2 Commit from starksm (2006-07-05 23:30 EDT) ------------------- Move the profileservice into the server module + system2 src/main/org/jboss/system/server/profileservice/SecurityActions.java 1.1 + system2 src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 1.1 + system2 src/main/org/jboss/system/server/profileservice/ServerPSBootstrap.java 1.1 + system2 src/main/org/jboss/system/server/profileservice/ServerImpl.java 1.1 + system2 src/main/org/jboss/system/server/profileservice/ManagementViewImpl.java 1.1 + system2 src/main/org/jboss/system/server/profileservice/ProfileServiceImpl.java 1.1 + system2 src/main/org/jboss/system/server/profile/basic/ProfileImpl.java 1.1 Commit from telrod (2006-07-05 23:30 EDT) ------------------ JBREM-302 - changing the way test object is being loaded by the server. JBossRemoting src/tests/org/jboss/test/remoting/marshall/dynamic/remote/http/MarshallerLoadingServer.java 1.9 JBossRemoting src/tests/org/jboss/test/remoting/marshall/dynamic/remote/socket/MarshallerLoadingServer.java 1.8 Commit from starksm (2006-07-05 23:30 EDT) ------------------- Move the profileservice into the server module + system2 src/tests/org/jboss/test/server/profileservice/MainTestCase.java 1.1 Commit from bwang (2006-07-06 00:11 EDT) ----------------- Clean up JBossCache src-50/org/jboss/cache/pojo/PojoTreeCache.java 1.3 Commit from asogor (2006-07-06 00:51 EDT) ------------------ getting invite response to work jboss-mail src/GRAPHICAL/templates/mail.ear/mail.sar/META-INF/jboss-service.xml.vm 1.46 jboss-mail src/calendar/calendarejb/build.xml 1.6 + jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus/MailResponse.java 1.1 - jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus/InviteResponse.java 1.2 jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/MailResposeHandlerMDB.java 1.2 jboss-mail src/java/org/jboss/mail/maillistener/CalendarMailListener.java 1.3 |
|
From: Aron S. <bi...@gm...> - 2006-07-06 04:52:32
|
User: asogor
Date: 06/07/06 00:51:59
Modified: src/GRAPHICAL/templates/mail.ear/mail.sar/META-INF
jboss-service.xml.vm
Log:
getting invite response to work
Revision Changes Path
1.46 +1 -1 jboss-mail/src/GRAPHICAL/templates/mail.ear/mail.sar/META-INF/jboss-service.xml.vm
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-service.xml.vm
===================================================================
RCS file: /cvsroot/jboss/jboss-mail/src/GRAPHICAL/templates/mail.ear/mail.sar/META-INF/jboss-service.xml.vm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- jboss-service.xml.vm 6 Jul 2006 02:28:10 -0000 1.45
+++ jboss-service.xml.vm 6 Jul 2006 04:51:59 -0000 1.46
@@ -385,7 +385,7 @@
<attribute name="CalendarUser">${CALENDAR_MAILER_NAME}</attribute>
<attribute name="ConnectionFactoryName">java:/JmsXA</attribute>
<attribute name="DestinationType">queue</attribute>
- <attribute name="Destination">maillist</attribute>
+ <attribute name="Destination">calendarResponse</attribute>
<depends>jboss.mq:service=DestinationManager</depends>
<depends>jboss.mq.destination:name=calendarResponse,service=Queue</depends>
</mbean>
|
|
From: Aron S. <bi...@gm...> - 2006-07-06 04:52:32
|
User: asogor
Date: 06/07/06 00:52:00
Modified: src/java/org/jboss/mail/maillistener
CalendarMailListener.java
Log:
getting invite response to work
Revision Changes Path
1.3 +85 -5 jboss-mail/src/java/org/jboss/mail/maillistener/CalendarMailListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CalendarMailListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-mail/src/java/org/jboss/mail/maillistener/CalendarMailListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CalendarMailListener.java 4 Jul 2006 19:44:30 -0000 1.2
+++ CalendarMailListener.java 6 Jul 2006 04:52:00 -0000 1.3
@@ -22,12 +22,26 @@
package org.jboss.mail.maillistener;
import javax.jms.ConnectionFactory;
+import javax.jms.ObjectMessage;
import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSession;
+import javax.naming.InitialContext;
import org.apache.log4j.Logger;
+import org.jboss.aspects.tx.Tx;
+import org.jboss.aspects.tx.TxType;
import org.jboss.mail.MailException;
import org.jboss.mail.MailListener;
+import org.jboss.mail.calendar.data.InviteStatus;
+import org.jboss.mail.calendar.eventbus.MailResponse;
import org.jboss.mail.message.Mail;
import org.jboss.mail.message.MailAddress;
import org.jboss.mail.message.Message;
@@ -82,18 +96,84 @@
for (int acnt = 0; acnt < address.length; acnt++) {
if(address[acnt].getUser().endsWith(calendarUser))
{
- handleCommand(address[acnt].getUser().replaceAll("." + calendarUser,""));
+ String[] params = address[acnt].getUser().replaceAll("." + calendarUser,"").split("\\.");
+ log.info("Do: " + params[0]);
+ if(params[0].toUpperCase().equals("ACCEPT"))
+ {
+ handleResponse(new MailResponse(mail.getFrom().getRawAddress(),InviteStatus.ACCEPTED,params[1]));
+ mail.removeTo(address[acnt]);
+ }
+ if(params[0].toUpperCase().equals("DECLINE"))
+ {
+ handleResponse(new MailResponse(mail.getFrom().getRawAddress(),InviteStatus.DECLINED,params[1]));
mail.removeTo(address[acnt]);
}
}
}
+ }
return msg;
}
- public void handleCommand(String command)
+ public void handleResponse(MailResponse response)
{
- String[] params = command.split("\\.");
- log.info("Do: " + params[0]);
+ try{
+ if(destinationType.toLowerCase().equals("topic"));
+ this.sendMessageTopic(response);
+ if(destinationType.toLowerCase().equals("queue"));
+ this.sendMessageQueue(response);
+ }
+ catch (Exception ex)
+ {
+ log.error("Failed to deliver response to Calendar Server",ex);
+ }
+ }
+
+ /**
+ * does the real work for sendMessage in the event of a "queue" destType
+ *
+ * @param msg
+ * the message to be sent
+ * @throws Exception
+ * if there is any problem (JMS related or otherwise)
+ */
+ @Tx(TxType.REQUIRED)
+ private void sendMessageQueue(MailResponse msg) throws Exception {
+ InitialContext ctx = new InitialContext();
+ QueueConnectionFactory cf = (QueueConnectionFactory)ctx.lookup(connectionFactoryName);
+ Queue queue = (Queue)ctx.lookup("queue/"+destination);
+ QueueConnection qc = cf.createQueueConnection();
+ QueueSession qs = qc.createQueueSession(true, 0);
+
+ try {
+ QueueSender sender = qs.createSender(queue);
+ ObjectMessage om = qs.createObjectMessage(msg);
+ sender.send(om);
+ } finally {
+ }
+
+ }
+
+ /**
+ * does the real work for sendMessage in the event of a "topic" destType
+ *
+ * @param msg
+ * the message to be sent
+ * @throws Exception
+ * if there is any problem (JMS related or otherwise)
+ */
+ @Tx(TxType.REQUIRED)
+ private void sendMessageTopic(MailResponse msg) throws Exception {
+ InitialContext ctx = new InitialContext();
+ TopicConnectionFactory cf = (TopicConnectionFactory)ctx.lookup(connectionFactoryName);
+ TopicConnection tc = cf.createTopicConnection();
+ TopicSession ts = tc.createTopicSession(true, 0);
+ Topic topic = (Topic)ctx.lookup("topic/"+destination);
+ try {
+ TopicPublisher pub = ts.createPublisher(topic);
+ ObjectMessage om = ts.createObjectMessage(msg);
+ pub.publish(om);
+ } finally {
+ }
}
public String getCalendarUser() {
|