Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:43:44
|
User: bwang Date: 06/07/07 05:43:42 Log: Directory /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic added to the repository |
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:35:26
|
User: bwang
Date: 06/07/07 05:35:23
Added: tests-50/functional/org/jboss/cache/pojo/util
MethodCallTest.java
Log:
Added undo interceptor stack.
Revision Changes Path
1.1 date: 2006/07/07 09:35:23; author: bwang; state: Exp;JBossCache/tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java
Index: MethodCallTest.java
===================================================================
/*
* JBoss, Home of Professional Open Source
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.cache.pojo.util;
import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.ClassInstanceAdvisor;
import org.jboss.aop.advice.Interceptor;
import org.jboss.cache.pojo.CacheInterceptor;
import org.jboss.cache.pojo.MethodDeclarations;
import org.jboss.cache.pojo.PojoUtil;
import java.lang.reflect.Method;
/**
*
* @author Ben Wang
*/
public class MethodCallTest extends TestCase
{
Log log_ = LogFactory.getLog(MethodCallTest.class);
public MethodCallTest(String name)
{
super(name);
}
protected void setUp() throws Exception
{
super.setUp();
log_.info("setUp() ....");
}
protected void tearDown() throws Exception
{
super.tearDown();
}
// public void testDummy() {}
public void testUtil() throws Throwable
{
log_.info("testUtil() ....");
InstanceAdvisor advisor = new ClassInstanceAdvisor();
Interceptor interceptor = new CacheInterceptor();
Method method = MethodDeclarations.undoAttachInterceptor;
Object[] args = new Object[] {advisor, interceptor};
PojoUtil util = new PojoUtil();
MethodCall mc = new MethodCall(method, args, util);
mc.invoke();
method = MethodDeclarations.undoDetachInterceptor;
mc = new MethodCall(method, args, util);
mc.invoke(util);
}
public void testBasic() throws Throwable
{
Integer i = new Integer(1);
Method method = Foo.class.getDeclaredMethod("setFoo",
new Class[] {Integer.class});
Object[] args = new Object[] {i};
Foo foo = new Foo();
MethodCall mc = new MethodCall(method, args, foo);
mc.invoke();
}
public static Test suite() throws Exception
{
return new TestSuite(MethodCallTest.class);
}
public static void main(String[] args) throws Exception
{
junit.textui.TestRunner.run(MethodCallTest.suite());
}
public static class Foo
{
Integer i;
public void setFoo(Integer i)
{
this.i = i;
}
public Integer getFoo()
{
return i;
}
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:35:25
|
User: bwang Date: 06/07/07 05:35:23 Added: tests-50/functional/org/jboss/cache/pojo TxUndoTest.java Log: Added undo interceptor stack. Revision Changes Path 1.1 date: 2006/07/07 09:35:23; author: bwang; state: Exp;JBossCache/tests-50/functional/org/jboss/cache/pojo/TxUndoTest.java Index: TxUndoTest.java =================================================================== /* * JBoss, Home of Professional Open Source * * Distributable under LGPL license. * See terms of license at gnu.org. */ package org.jboss.cache.pojo; import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.aop.Advised; import org.jboss.aop.advice.Interceptor; import javax.transaction.TransactionManager; /** * Additional basic tests * * @author Ben Wang */ public class TxUndoTest extends TestCase { Log log_ = LogFactory.getLog(TxUndoTest.class); PojoCache cache_; TransactionManager tx_mgr; public TxUndoTest(String name) { super(name); } protected void setUp() throws Exception { super.setUp(); log_.info("setUp() ...."); String configFile = "META-INF/local-service.xml"; cache_ = PojoCacheFactory.createInstance(configFile); cache_.start(); tx_mgr = DummyTransactionManager.getInstance(); } protected void tearDown() throws Exception { super.tearDown(); cache_.stop(); } // public void testDummy() {} public void testSimpleTxWithRollback1() throws Exception { log_.info("testSimpleTxWithRollback1() ...."); Person test = new Person(); test.setName("Ben"); test.setAge(10); tx_mgr.begin(); cache_.attach("/a", test); tx_mgr.getTransaction().rollback(); assertFalse("Should not have cache interceptor ", hasCacheInterceptor(test)); } private boolean hasCacheInterceptor(Object pojo) { Interceptor[] interceptors = ((Advised)pojo)._getInstanceAdvisor().getInterceptors(); for(int i=0; i < interceptors.length; i++) { if(interceptors[i] instanceof CacheInterceptor) return true; } return false; } public void testSimpleTxWithRollback2() throws Exception { log_.info("testSimpleTxWithRollback1() ...."); Person test = new Person(); test.setName("Ben"); test.setAge(10); cache_.attach("/a", test); tx_mgr.begin(); cache_.detach("/a"); tx_mgr.getTransaction().rollback(); assertTrue("Should still have cache interceptor ", hasCacheInterceptor(test)); } public void testSimpleTxWithRollback3() throws Exception { log_.info("testSimpleTxWithRollback1() ...."); Person test = new Person(); test.setName("Ben"); test.setAge(10); tx_mgr.begin(); cache_.attach("/a", test); cache_.detach("/a"); tx_mgr.getTransaction().rollback(); assertFalse("Should not have cache interceptor ", hasCacheInterceptor(test)); } public static Test suite() throws Exception { return new TestSuite(TxUndoTest.class); } public static void main(String[] args) throws Exception { junit.textui.TestRunner.run(TxUndoTest.suite()); } } |
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:34:44
|
User: bwang
Date: 06/07/07 05:34:42
Modified: src-50/org/jboss/cache/pojo BaseInterceptor.java
CacheInterceptor.java
PojoTxSynchronizationHandler.java PojoUtil.java
TreeCacheAopDelegate.java
Added: src-50/org/jboss/cache/pojo MethodDeclarations.java
Removed: src-50/org/jboss/cache/pojo ModificationEntry.java
Log:
Added undo interceptor stack.
Revision Changes Path
1.4 +3 -4 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- BaseInterceptor.java 6 Jul 2006 09:25:40 -0000 1.3
+++ BaseInterceptor.java 7 Jul 2006 09:34:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.jboss.cache.pojo;
import org.jboss.cache.Fqn;
+import org.jboss.aop.advice.Interceptor;
/**
@@ -16,7 +17,7 @@
*/
public interface BaseInterceptor
- extends org.jboss.aop.advice.Interceptor
+ extends Interceptor, Cloneable
{
/**
* Get the original fqn that is associated with this interceptor (or advisor).
@@ -29,7 +30,5 @@
void setAopInstance(AOPInstance aopInstance);
-// BaseInterceptor cloneInterceptor();
-
-// void setInterceptor(BaseInterceptor interceptor);
+ void setInterceptor(Interceptor interceptor);
}
1.4 +22 -3 JBossCache/src-50/org/jboss/cache/pojo/CacheInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/CacheInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CacheInterceptor.java 27 Jun 2006 06:19:17 -0000 1.3
+++ CacheInterceptor.java 7 Jul 2006 09:34:42 -0000 1.4
@@ -11,6 +11,7 @@
import org.jboss.aop.Advised;
import org.jboss.aop.Advisor;
import org.jboss.aop.InstanceAdvisor;
+import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.FieldInvocation;
import org.jboss.aop.joinpoint.FieldReadInvocation;
import org.jboss.aop.joinpoint.FieldWriteInvocation;
@@ -23,9 +24,8 @@
import java.util.Iterator;
/**
- * Created: Sat Apr 26 10:35:01 2003
+ * Main dynamic interceptor to intercept for field replication.
*
- * @author Harald Gliebe
* @author Ben Wang
*/
@@ -45,11 +45,30 @@
this.type = type;
}
+ public CacheInterceptor()
+ {
+ }
+
public AOPInstance getAopInstance()
{
return aopInstance;
}
+ public Object clone()
+ {
+ CacheInterceptor interceptor = new CacheInterceptor();
+ interceptor.setFqn(getFqn());
+ interceptor.setAopInstance(getAopInstance());
+ return interceptor;
+ }
+
+ public void setInterceptor(Interceptor intcptr)
+ {
+ CacheInterceptor interceptor = (CacheInterceptor)intcptr;
+ setFqn(interceptor.getFqn());
+ setAopInstance(interceptor.getAopInstance());
+ }
+
public void setAopInstance(AOPInstance aopInstance)
{
this.aopInstance = aopInstance;
1.5 +20 -65 JBossCache/src-50/org/jboss/cache/pojo/PojoTxSynchronizationHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTxSynchronizationHandler.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/PojoTxSynchronizationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PojoTxSynchronizationHandler.java 6 Jul 2006 02:42:35 -0000 1.4
+++ PojoTxSynchronizationHandler.java 7 Jul 2006 09:34:42 -0000 1.5
@@ -10,7 +10,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.aop.InstanceAdvisor;
-import org.jboss.cache.pojo.interceptors.PojoTxUndoInterceptor;
+import org.jboss.cache.pojo.interceptors.PojoTxUndoSynchronizationInterceptor;
+import org.jboss.cache.pojo.util.MethodCall;
import javax.transaction.Status;
import javax.transaction.Synchronization;
@@ -23,18 +24,16 @@
* Handling the rollback operation for PojoCache level, specifically interceptor add/remove, etc.
*
* @author Ben Wang
- * @version $Id: PojoTxSynchronizationHandler.java,v 1.4 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: PojoTxSynchronizationHandler.java,v 1.5 2006/07/07 09:34:42 bwang Exp $
*/
public class PojoTxSynchronizationHandler implements Synchronization
{
private static Log log = LogFactory.getLog(PojoTxSynchronizationHandler.class.getName());
- private ThreadLocal undoListLocal_ = new ThreadLocal();
- private PojoTxUndoInterceptor interceptor_;
+ private List undoList_ = new ArrayList();
- public PojoTxSynchronizationHandler(Transaction tx, PojoTxUndoInterceptor interceptor)
+ public PojoTxSynchronizationHandler()
{
- interceptor_ = interceptor;
}
public void beforeCompletion()
@@ -52,7 +51,7 @@
break;
case Status.STATUS_MARKED_ROLLBACK:
case Status.STATUS_ROLLEDBACK:
- log.debug("Running rollback phase");
+ log.debug("Running Pojo rollback phase");
runRollbackPhase();
log.debug("Finished rollback phase");
break;
@@ -63,81 +62,37 @@
}
finally
{
+ resetUndoOp();
}
}
private void runRollbackPhase()
{
// Rollback the pojo interceptor add/remove
- List list = getModList();
- for (int i = (list.size() - 1); i >= 0; i--)
- {
- ModificationEntry ent = (ModificationEntry) list.get(i);
- InstanceAdvisor advisor = ent.getInstanceAdvisor();
- BaseInterceptor interceptor = ent.getCacheInterceptor();
- switch (ent.getOpType())
+ for (int i = (undoList_.size() - 1); i >= 0; i--)
{
- case ModificationEntry.INTERCEPTOR_ADD:
- advisor.removeInterceptor(interceptor.getName());
- break;
- case ModificationEntry.INTERCEPTOR_REMOVE:
- advisor.appendInterceptor(interceptor);
- break;
- case ModificationEntry.COLLECTION_REPLACE:
- Field field = ent.getField();
- Object key = ent.getKey();
- Object value = ent.getOldValue();
+ MethodCall mc = (MethodCall) undoList_.get(i);
try
{
- field.set(key, value);
- } catch (IllegalAccessException e)
+ mc.invoke();
+ } catch (Throwable throwable)
{
- throw new RuntimeException("PojoTxSynchronizationHandler.runRollbackPhase(): Exception: " + e);
- }
- break;
- default:
- throw new IllegalArgumentException("PojoTxSynchronizationHandler.runRollbackPhase: getOptType: "
- + ent.getOpType());
- }
- }
- resetUndoOp();
+ throwable.printStackTrace();
+ throw new PojoCacheException(
+ "PojoTxSynchronizationHandler.runRollbackPhase(): error: " +throwable.toString());
}
-
- public void addUndoInterceptor(InstanceAdvisor advisor, BaseInterceptor interceptor, int op)
- {
- List list = (List) undoListLocal_.get();
- if (list == null)
- {
- list = new ArrayList();
- undoListLocal_.set(list);
}
- ModificationEntry ent = new ModificationEntry(advisor, interceptor, op);
- list.add(ent);
}
- public void addUndoCollectionProxy(Field field, Object key, Object oldValue)
- {
- List list = (List) undoListLocal_.get();
- if (list == null)
+ public void addToList(MethodCall mc)
{
- list = new ArrayList();
- undoListLocal_.set(list);
- }
- ModificationEntry ent = new ModificationEntry(field, key, oldValue);
- list.add(ent);
+ undoList_.add(mc);
}
public void resetUndoOp()
{
- List list = (List) undoListLocal_.get();
- list.clear();
- interceptor_.resetUndoOp();
- }
-
- public List getModList()
- {
- // No need to make it unmodifiable since this is thread local
- return (List) undoListLocal_.get();
+ undoList_.clear();
+ PojoTxUndoSynchronizationInterceptor.reset();
}
}
1.3 +11 -7 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PojoUtil.java 6 Jul 2006 09:25:40 -0000 1.2
+++ PojoUtil.java 7 Jul 2006 09:34:42 -0000 1.3
@@ -10,37 +10,41 @@
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.Interceptor;
import org.jboss.cache.CacheException;
+import org.jboss.cache.pojo.annotation.TxUndo;
import java.lang.reflect.Field;
/**
- *
+ * Utility class for method wrappers that we are interested to rollback (i.e., undo).
* @author Ben Wang
- * @version $Id: PojoUtil.java,v 1.2 2006/07/06 09:25:40 bwang Exp $
+ * @version $Id: PojoUtil.java,v 1.3 2006/07/07 09:34:42 bwang Exp $
*/
public class PojoUtil
{
- void attachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ @TxUndo
+ public void attachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
{
advisor.appendInterceptor(interceptor);
}
- void undoAttachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ @TxUndo
+ public void detachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
{
advisor.removeInterceptor(interceptor.getName());
}
- void detachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ public void undoAttachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
{
advisor.removeInterceptor(interceptor.getName());
}
- void undoDetachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ public void undoDetachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
{
advisor.appendInterceptor(interceptor);
}
- void collectionReplaceWithProxy(Object obj, Object value, Field field, Object newValue)
+
+ public 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
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- TreeCacheAopDelegate.java 6 Jul 2006 09:25:40 -0000 1.5
+++ TreeCacheAopDelegate.java 7 Jul 2006 09:34:42 -0000 1.6
@@ -254,7 +254,7 @@
{
if (!detachOnly)
{
- advisor.removeInterceptor(interceptor.getName());
+ util_.detachInterceptor(advisor, interceptor);
undoMap.put(advisor, interceptor);
} else
{
1.1 date: 2006/07/07 09:34:42; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/MethodDeclarations.java
Index: MethodDeclarations.java
===================================================================
/*
* JBoss, Home of Professional Open Source
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.cache.pojo;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.Interceptor;
import java.lang.reflect.Method;
/**
* Method declarations for undo method mostly.
*
* @author Ben Wang
* @version $Revision: 1.1 $
*/
public class MethodDeclarations
{
public static final Method attachInterceptor;
public static final Method detachInterceptor;
public static final Method undoAttachInterceptor;
public static final Method undoDetachInterceptor;
static
{
try
{
attachInterceptor = PojoUtil.class.getDeclaredMethod("attachInterceptor",
new Class[] {InstanceAdvisor.class, Interceptor.class});
detachInterceptor = PojoUtil.class.getDeclaredMethod("detachInterceptor",
new Class[] {InstanceAdvisor.class, Interceptor.class});
undoAttachInterceptor = PojoUtil.class.getDeclaredMethod("undoAttachInterceptor",
new Class[] {InstanceAdvisor.class, Interceptor.class});
undoDetachInterceptor = PojoUtil.class.getDeclaredMethod("undoDetachInterceptor",
new Class[] {InstanceAdvisor.class, Interceptor.class});
}
catch (NoSuchMethodException ex)
{
ex.printStackTrace();
throw new ExceptionInInitializerError(ex.toString());
}
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:34:43
|
User: bwang
Date: 06/07/07 05:34:42
Added: src-50/org/jboss/cache/pojo/util MethodCall.java
Log:
Added undo interceptor stack.
Revision Changes Path
1.1 date: 2006/07/07 09:34:41; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/util/MethodCall.java
Index: MethodCall.java
===================================================================
package org.jboss.cache.pojo.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* A special MethodCall object to wrap around the undo method call. No Serializable is required.
*
* @author Ben Wang
* @version $Revision: 1.1 $
*/
public class MethodCall
{
/**
* The name of the method, case sensitive.
*/
protected String method_name = null;
/**
* The arguments of the method.
*/
protected Object[] args = null;
/**
* The class types, e.g., new Class[]{String.class, int.class}.
*/
protected Class[] types = null;
/**
* The signature, e.g., new String[]{String.class.getName(), int.class.getName()}.
*/
protected String[] signature = null;
/**
* The Method of the call.
*/
protected Method method = null;
/*
* The target object to invoke upon.
*/
protected Object target = null;
protected static final Log log = LogFactory.getLog(MethodCall.class);
public MethodCall(Method method, Object[] arguments, Object target)
{
init(method);
if (arguments != null) args = arguments;
this.target = target;
}
private void init(Method method)
{
this.method = method;
method_name = method.getName();
}
public String getName()
{
return method_name;
}
public void setName(String n)
{
method_name = n;
}
public Object[] getArgs()
{
return args;
}
public void setArgs(Object[] args)
{
if (args != null)
this.args = args;
}
public Method getMethod()
{
return method;
}
public void setMethod(Method m)
{
init(m);
}
Method findMethod(Class target_class) throws Exception
{
int len = args != null ? args.length : 0;
Method m;
Method[] methods = getAllMethods(target_class);
for (int i = 0; i < methods.length; i++)
{
m = methods[i];
if (m.getName().equals(method_name))
{
if (m.getParameterTypes().length == len)
return m;
}
}
return null;
}
Method[] getAllMethods(Class target)
{
Class superclass = target;
List methods = new ArrayList();
int size = 0;
while (superclass != null)
{
Method[] m = superclass.getDeclaredMethods();
methods.add(m);
size += m.length;
superclass = superclass.getSuperclass();
}
Method[] result = new Method[size];
int index = 0;
for (Iterator i = methods.iterator(); i.hasNext();)
{
Method[] m = (Method[]) i.next();
System.arraycopy(m, 0, result, index, m.length);
index += m.length;
}
return result;
}
/**
* Returns the first method that matches the specified name and parameter types. The overriding
* methods have priority. The method is chosen from all the methods of the current class and all
* its superclasses and superinterfaces.
*
* @return the matching method or null if no mathching method has been found.
*/
Method getMethod(Class target, String methodName, Class[] types)
{
if (types == null)
{
types = new Class[0];
}
Method[] methods = getAllMethods(target);
methods:
for (int i = 0; i < methods.length; i++)
{
Method m = methods[i];
if (!methodName.equals(m.getName()))
{
continue;
}
Class[] parameters = m.getParameterTypes();
if (types.length != parameters.length)
{
continue;
}
for (int j = 0; j < types.length; j++)
{
if (!types[j].equals(parameters[j]))
{
continue methods;
}
}
return m;
}
return null;
}
public Object invoke() throws Throwable
{
return this.invoke(this.target);
}
/**
* Invokes the method with the supplied arguments against the target object.
* If a method lookup is provided, it will be used. Otherwise, the default
* method lookup will be used.
*
* @param target - the object that you want to invoke the method on
* @return an object
*/
protected Object invoke(Object target) throws Throwable
{
Class cl;
Method meth = null;
Object retval = null;
if (method_name == null || target == null)
{
if (log.isErrorEnabled()) log.error("method name or target is null");
return null;
}
cl = target.getClass();
try
{
if (this.method != null)
meth = this.method;
if (meth != null)
{
retval = meth.invoke(target, args);
} else
{
throw new NoSuchMethodException(method_name);
}
return retval;
}
catch (InvocationTargetException inv_ex)
{
throw inv_ex.getTargetException();
}
catch (NoSuchMethodException no)
{
StringBuffer sb = new StringBuffer();
sb.append("found no method called ").append(method_name).append(" in class ");
sb.append(cl.getName()).append(" with (");
if (args != null)
{
for (int i = 0; i < args.length; i++)
{
if (i > 0)
sb.append(", ");
sb.append((args[i] != null) ? args[i].getClass().getName() : "null");
}
}
sb.append(") formal parameters");
log.error(sb.toString());
throw no;
}
catch (Throwable e)
{
// e.printStackTrace(System.err);
if (log.isErrorEnabled()) log.error("exception in invoke()", e);
throw e;
}
}
public Object invoke(Object target, Object[] args) throws Throwable
{
if (args != null)
this.args = args;
return invoke(target);
}
Class[] getTypesFromString(Class cl, String[] signature) throws Exception
{
String name;
Class parameter;
Class[] mytypes = new Class[signature.length];
for (int i = 0; i < signature.length; i++)
{
name = signature[i];
if ("long".equals(name))
parameter = long.class;
else if ("int".equals(name))
parameter = int.class;
else if ("short".equals(name))
parameter = short.class;
else if ("char".equals(name))
parameter = char.class;
else if ("byte".equals(name))
parameter = byte.class;
else if ("float".equals(name))
parameter = float.class;
else if ("double".equals(name))
parameter = double.class;
else if ("boolean".equals(name))
parameter = boolean.class;
else
parameter = Class.forName(name, false, cl.getClassLoader());
mytypes[i] = parameter;
}
return mytypes;
}
public String toString()
{
StringBuffer ret = new StringBuffer();
boolean first = true;
if (method_name != null)
ret.append(method_name);
ret.append('(');
if (args != null)
{
for (int i = 0; i < args.length; i++)
{
if (first)
first = false;
else
ret.append(", ");
ret.append(args[i]);
}
}
ret.append(')');
return ret.toString();
}
public String toStringDetails()
{
StringBuffer ret = new StringBuffer();
ret.append("MethodCall ");
if (method_name != null)
ret.append("name=").append(method_name);
ret.append(", number of args=").append((args != null ? args.length : 0)).append(')');
if (args != null)
{
ret.append("\nArgs:");
for (int i = 0; i < args.length; i++)
{
ret.append("\n[").append(args[i]).append(" (").
append((args[i] != null ? args[i].getClass().getName() : "null")).append(")]");
}
}
return ret.toString();
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:34:43
|
User: bwang
Date: 06/07/07 05:34:41
Modified: src-50/org/jboss/cache/pojo/interceptors
AbstractInterceptor.java PojoTxLockInterceptor.java
PojoTxUndoInterceptor.java
Added: src-50/org/jboss/cache/pojo/interceptors
PojoTxUndoSynchronizationInterceptor.java
Log:
Added undo interceptor stack.
Revision Changes Path
1.2 +2 -2 JBossCache/src-50/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractInterceptor.java 6 Jul 2006 02:42:35 -0000 1.1
+++ AbstractInterceptor.java 7 Jul 2006 09:34:41 -0000 1.2
@@ -15,10 +15,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-/** The first interceptor that deals initialization.
+/** Base interceptor class for PojoCache interceptor stack.
*
* @author Ben Wang
- * @version $Id: AbstractInterceptor.java,v 1.1 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: AbstractInterceptor.java,v 1.2 2006/07/07 09:34:41 bwang Exp $
*/
public abstract class AbstractInterceptor implements Interceptor
{
1.3 +3 -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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PojoTxLockInterceptor.java 6 Jul 2006 05:48:37 -0000 1.2
+++ PojoTxLockInterceptor.java 7 Jul 2006 09:34:41 -0000 1.3
@@ -17,12 +17,13 @@
/** Interceptor that handles the parent node lock associated with transaction.
*
* @author Ben Wang
- * @version $Id: PojoTxLockInterceptor.java,v 1.2 2006/07/06 05:48:37 bwang Exp $
+ * @version $Id: PojoTxLockInterceptor.java,v 1.3 2006/07/07 09:34:41 bwang Exp $
*/
public class PojoTxLockInterceptor extends AbstractInterceptor
{
private final String LOCK = "_lock_";
- private final int RETRY = 5; // retry times for lockPojo just in case there is upgrade exception during concurrent access.
+ // retry times for lockPojo just in case there is upgrade exception during concurrent access.
+ private final int RETRY = 5;
public Object invoke(Invocation in) throws Throwable
{
1.2 +38 -51 JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxUndoInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTxUndoInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxUndoInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PojoTxUndoInterceptor.java 6 Jul 2006 02:42:35 -0000 1.1
+++ PojoTxUndoInterceptor.java 7 Jul 2006 09:34:41 -0000 1.2
@@ -7,76 +7,63 @@
package org.jboss.cache.pojo.interceptors;
+import org.jboss.cache.pojo.MethodDeclarations;
+import org.jboss.cache.pojo.PojoTxSynchronizationHandler;
+import org.jboss.cache.pojo.util.MethodCall;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.cache.CacheException;
-import org.jboss.cache.pojo.PojoTxSynchronizationHandler;
-
-import javax.transaction.Transaction;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
+import java.lang.reflect.Method;
-/** Interceptor that handles registration of tx synchronization for rollback
- * operations.
+/**
+ * Interceptor (done via aop advice) for transaction undo. This is is attached to the
+ * operation that needs a corresponding undo, e.g., attachInterceptor.
*
* @author Ben Wang
- * @version $Id: PojoTxUndoInterceptor.java,v 1.1 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: PojoTxUndoInterceptor.java,v 1.2 2006/07/07 09:34:41 bwang Exp $
*/
public class PojoTxUndoInterceptor extends AbstractInterceptor
{
- public static final String HANDLER = "SYNCHRO_HANDLER";
- private ThreadLocal hasSynchronizationHandler_ = new ThreadLocal();
+ /// Just that AOP requires an extra key.
+ public static final String TAG = "PojoCache";
public Object invoke(Invocation in) throws Throwable
{
- if(!(in instanceof MethodInvocation))
+ if (!(in instanceof MethodInvocation))
{
- throw new IllegalArgumentException("TxSyncrhonizationInterceptor.invoke(): invocation not MethodInvocation");
- }
- MethodInvocation invocation = (MethodInvocation)in;
- try {
- registerTxHandler(invocation);
- return invocation.invokeNext(); // proceed to next advice or actual call
- } finally {
- }
+ throw new IllegalArgumentException("TxUndoInterceptor.invoke(): invocation not MethodInvocation");
}
+ MethodInvocation invocation = (MethodInvocation) in;
- private void registerTxHandler(MethodInvocation invocation) throws CacheException
- {
- try
- {
- // Need to have this in case of rollback
- Boolean isTrue = (Boolean) hasSynchronizationHandler_.get();
- if (isTrue == null || !isTrue.booleanValue())
- {
- Transaction tx = (Transaction)invocation.getMetaData(PojoTxInterceptor.TAG, PojoTxInterceptor.TX);
- if (tx == null)
+ PojoTxSynchronizationHandler handler =
+ PojoTxUndoSynchronizationInterceptor.getSynchronizationHandler();
+
+ if(handler == null)
{
- throw new IllegalStateException("PojoCache.registerTxHanlder(). Can't have null tx handle.");
+ return invocation.invokeNext();
+// TODO handler is null can mean we are not calling the right interceptor stack. Need to revisit.
+// E.g., a fresh getObject or find will trigger this.
+// throw new IllegalStateException("PojoTxUndoInterceptor.invoke(): PojoTxSynchronizationHandler is null");
}
- PojoTxSynchronizationHandler handler = new PojoTxSynchronizationHandler(tx, this);
-
- log.debug("Registering PojoTxSynchronizationHandler for rollback if ncessary " +handler);
- // Register so we can rollback if necessary
- tx.registerSynchronization(handler);
-
- // Store the handler to the invocation metadata
- invocation.getMetaData().addMetaData(PojoTxInterceptor.TAG, HANDLER, handler);
-
- hasSynchronizationHandler_.set(Boolean.TRUE);
- }
- } catch (RollbackException e)
+ // Add to the undo list
+ String methodName = invocation.getMethod().getName();
+ // TODO Needs to handle Collection interceptor as well.
+ if( methodName.equals(MethodDeclarations.attachInterceptor.getName()))
{
- throw new CacheException("_putObject(). Exception: " + e);
- } catch (SystemException e)
+ Method method = MethodDeclarations.undoAttachInterceptor;
+ MethodCall mc = new MethodCall(method, invocation.getArguments(), invocation.getTargetObject());
+ handler.addToList(mc);
+ } else if ( methodName.equals(MethodDeclarations.detachInterceptor.getName()))
{
- throw new CacheException("_putObject(). Exception: " + e);
- }
+ Method method = MethodDeclarations.undoDetachInterceptor;
+ MethodCall mc = new MethodCall(method, invocation.getArguments(), invocation.getTargetObject());
+ handler.addToList(mc);
+ } else
+ {
+ throw new RuntimeException("PojoTxUndoInterceptor: invalid invocation name: " +methodName);
}
- public void resetUndoOp()
- {
- hasSynchronizationHandler_.set(null);
+ return invocation.invokeNext();
}
+
}
1.1 date: 2006/07/07 09:34:41; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/interceptors/PojoTxUndoSynchronizationInterceptor.java
Index: PojoTxUndoSynchronizationInterceptor.java
===================================================================
/*
* JBoss, Home of Professional Open Source
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.cache.pojo.interceptors;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.cache.pojo.PojoTxSynchronizationHandler;
import org.jboss.cache.pojo.PojoCacheException;
import javax.transaction.Transaction;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
/** Interceptor that handles registration of tx synchronization for rollback
* operations.
*
* @author Ben Wang
* @version $Id: PojoTxUndoSynchronizationInterceptor.java,v 1.1 2006/07/07 09:34:41 bwang Exp $
*/
public class PojoTxUndoSynchronizationInterceptor extends AbstractInterceptor
{
// We stores the handler in thread local since the afterCompletion won't be
// called untill tx.commit(). Note that this is static since it can be
// recursive call to attach/detach.
private static ThreadLocal synchronizationHandler_ = new ThreadLocal();
public Object invoke(Invocation in) throws Throwable
{
if(!(in instanceof MethodInvocation))
{
throw new IllegalArgumentException("TxSyncrhonizationInterceptor.invoke(): invocation not MethodInvocation");
}
MethodInvocation invocation = (MethodInvocation)in;
try {
registerTxHandler(invocation);
return invocation.invokeNext(); // proceed to next advice or actual call
} finally {
}
}
private void registerTxHandler(MethodInvocation invocation) throws PojoCacheException
{
try
{
// Need to have this in case of rollback
PojoTxSynchronizationHandler handler = (PojoTxSynchronizationHandler) synchronizationHandler_.get();
if (handler == null)
{
// First entry point for this transaction scope.
Transaction tx = (Transaction)invocation.getMetaData(PojoTxInterceptor.TAG, PojoTxInterceptor.TX);
if (tx == null)
{
throw new IllegalStateException("PojoCache.registerTxHanlder(). Can't have null tx handle.");
}
handler = new PojoTxSynchronizationHandler();
log.debug("Registering PojoTxSynchronizationHandler for rollback if ncessary " +handler);
// Register so we can rollback if necessary
tx.registerSynchronization(handler);
synchronizationHandler_.set(handler);
}
} catch (RollbackException e)
{
throw new PojoCacheException("PojoTxUndoSynchronizationInterceptor.registerTxHandler(): Exception: " + e);
} catch (SystemException e)
{
throw new PojoCacheException("PojoTxUndoSynchronizationInterceptor.registerTxHandler(): Exception: " + e);
}
}
public static PojoTxSynchronizationHandler getSynchronizationHandler()
{
return (PojoTxSynchronizationHandler)synchronizationHandler_.get();
}
public static void reset()
{
synchronizationHandler_.set(null);
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:34:43
|
User: bwang
Date: 06/07/07 05:34:41
Modified: src-50/org/jboss/cache/pojo/collection
AbstractCollectionInterceptor.java
CachedListInterceptor.java
CachedMapInterceptor.java CachedSetInterceptor.java
Log:
Added undo interceptor stack.
Revision Changes Path
1.4 +8 -1 JBossCache/src-50/org/jboss/cache/pojo/collection/AbstractCollectionInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractCollectionInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/collection/AbstractCollectionInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AbstractCollectionInterceptor.java 27 Jun 2006 06:19:16 -0000 1.3
+++ AbstractCollectionInterceptor.java 7 Jul 2006 09:34:41 -0000 1.4
@@ -15,7 +15,7 @@
* Abstract base class for collection interceptor.
*
* @author Ben Wang
- * @version $Id: AbstractCollectionInterceptor.java,v 1.3 2006/06/27 06:19:16 bwang Exp $
+ * @version $Id: AbstractCollectionInterceptor.java,v 1.4 2006/07/07 09:34:41 bwang Exp $
*/
@SuppressWarnings({"CanBeFinal"})
public abstract class AbstractCollectionInterceptor implements BaseInterceptor
@@ -71,4 +71,11 @@
{
return attached_;
}
+
+ abstract void setInMemoryCopy(Object obj);
+ abstract Object getInMemoryCopy();
+ abstract void setCacheCopy(Object obj);
+ abstract Object getCacheCopy();
+ abstract void setCurrentCopy(Object obj);
+ abstract Object getCurrecntCopy();
}
1.4 +54 -0 JBossCache/src-50/org/jboss/cache/pojo/collection/CachedListInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedListInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/collection/CachedListInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CachedListInterceptor.java 27 Jun 2006 06:19:16 -0000 1.3
+++ CachedListInterceptor.java 7 Jul 2006 09:34:41 -0000 1.4
@@ -8,6 +8,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.pojo.PojoTreeCache;
+import org.jboss.aop.advice.Interceptor;
import java.util.ArrayList;
import java.util.List;
@@ -44,6 +45,29 @@
current_ = cacheImpl_;
}
+ public CachedListInterceptor() {}
+
+ public Object clone()
+ {
+ CachedListInterceptor interceptor = new CachedListInterceptor();
+ interceptor.setFqn(getFqn());
+ interceptor.setAopInstance(getAopInstance());
+ interceptor.setCurrentCopy(getCurrecntCopy());
+ interceptor.setInMemoryCopy(getInMemoryCopy());
+ interceptor.setCacheCopy(getCacheCopy());
+ return interceptor;
+ }
+
+ public void setInterceptor(Interceptor intcptr)
+ {
+ CachedListInterceptor interceptor = (CachedListInterceptor)intcptr;
+ setFqn(interceptor.getFqn());
+ setAopInstance(interceptor.getAopInstance());
+ setCurrentCopy(interceptor.getCurrecntCopy());
+ setInMemoryCopy(interceptor.getInMemoryCopy());
+ setCacheCopy(interceptor.getCacheCopy());
+ }
+
/**
* When we want to associate this proxy with the cache again. We will need to translate the in-memory
* content to the cache store first.
@@ -90,6 +114,36 @@
current_ = inMemImpl_;
}
+ void setInMemoryCopy(Object obj)
+ {
+ inMemImpl_ = (List)obj;
+ }
+
+ Object getInMemoryCopy()
+ {
+ return inMemImpl_;
+ }
+
+ void setCacheCopy(Object obj)
+ {
+ cacheImpl_ = (List)obj;
+ }
+
+ Object getCacheCopy()
+ {
+ return cacheImpl_;
+ }
+
+ void setCurrentCopy(Object obj)
+ {
+ current_ = (List)obj;
+ }
+
+ Object getCurrecntCopy()
+ {
+ return current_;
+ }
+
private void toMemory(boolean removeFromCache)
{
if (inMemImpl_ == null)
1.4 +54 -0 JBossCache/src-50/org/jboss/cache/pojo/collection/CachedMapInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedMapInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/collection/CachedMapInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CachedMapInterceptor.java 27 Jun 2006 06:19:16 -0000 1.3
+++ CachedMapInterceptor.java 7 Jul 2006 09:34:41 -0000 1.4
@@ -8,6 +8,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.pojo.PojoTreeCache;
+import org.jboss.aop.advice.Interceptor;
import java.util.HashMap;
import java.util.Iterator;
@@ -39,6 +40,59 @@
current_ = cacheImpl_;
}
+ CachedMapInterceptor() {}
+
+ public Object clone()
+ {
+ CachedListInterceptor interceptor = new CachedListInterceptor();
+ interceptor.setFqn(getFqn());
+ interceptor.setAopInstance(getAopInstance());
+ interceptor.setCurrentCopy(getCurrecntCopy());
+ interceptor.setInMemoryCopy(getInMemoryCopy());
+ interceptor.setCacheCopy(getCacheCopy());
+ return interceptor;
+ }
+
+ public void setInterceptor(Interceptor intcptr)
+ {
+ CachedListInterceptor interceptor = (CachedListInterceptor)intcptr;
+ setFqn(interceptor.getFqn());
+ setAopInstance(interceptor.getAopInstance());
+ setCurrentCopy(interceptor.getCurrecntCopy());
+ setInMemoryCopy(interceptor.getInMemoryCopy());
+ setCacheCopy(interceptor.getCacheCopy());
+ }
+
+ void setInMemoryCopy(Object obj)
+ {
+ inMemImpl_ = (Map)obj;
+ }
+
+ Object getInMemoryCopy()
+ {
+ return inMemImpl_;
+ }
+
+ void setCacheCopy(Object obj)
+ {
+ cacheImpl_ = (Map)obj;
+ }
+
+ Object getCacheCopy()
+ {
+ return cacheImpl_;
+ }
+
+ void setCurrentCopy(Object obj)
+ {
+ current_ = (Map)obj;
+ }
+
+ Object getCurrecntCopy()
+ {
+ return current_;
+ }
+
/**
* When we want to associate this proxy with the cache again. We will need to translate the in-memory
* content to the cache store first.
1.4 +54 -0 JBossCache/src-50/org/jboss/cache/pojo/collection/CachedSetInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedSetInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/collection/CachedSetInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CachedSetInterceptor.java 27 Jun 2006 06:19:16 -0000 1.3
+++ CachedSetInterceptor.java 7 Jul 2006 09:34:41 -0000 1.4
@@ -8,6 +8,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.pojo.PojoTreeCache;
+import org.jboss.aop.advice.Interceptor;
import java.util.HashSet;
import java.util.Iterator;
@@ -40,6 +41,59 @@
current_ = cacheImpl_;
}
+ public CachedSetInterceptor() {}
+
+ public Object clone()
+ {
+ CachedListInterceptor interceptor = new CachedListInterceptor();
+ interceptor.setFqn(getFqn());
+ interceptor.setAopInstance(getAopInstance());
+ interceptor.setCurrentCopy(getCurrecntCopy());
+ interceptor.setInMemoryCopy(getInMemoryCopy());
+ interceptor.setCacheCopy(getCacheCopy());
+ return interceptor;
+ }
+
+ public void setInterceptor(Interceptor intcptr)
+ {
+ CachedListInterceptor interceptor = (CachedListInterceptor)intcptr;
+ setFqn(interceptor.getFqn());
+ setAopInstance(interceptor.getAopInstance());
+ setCurrentCopy(interceptor.getCurrecntCopy());
+ setInMemoryCopy(interceptor.getInMemoryCopy());
+ setCacheCopy(interceptor.getCacheCopy());
+ }
+
+ void setInMemoryCopy(Object obj)
+ {
+ inMemImpl_ = (Set)obj;
+ }
+
+ Object getInMemoryCopy()
+ {
+ return inMemImpl_;
+ }
+
+ void setCacheCopy(Object obj)
+ {
+ cacheImpl_ = (Set)obj;
+ }
+
+ Object getCacheCopy()
+ {
+ return cacheImpl_;
+ }
+
+ void setCurrentCopy(Object obj)
+ {
+ current_ = (Set)obj;
+ }
+
+ Object getCurrecntCopy()
+ {
+ return current_;
+ }
+
/**
* When we want to associate this proxy with the cache again. We will need to translate the in-memory
* content to the cache store first.
|
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:34:43
|
User: bwang Date: 06/07/07 05:34:41 Added: src-50/org/jboss/cache/pojo/annotation TxUndo.java Log: Added undo interceptor stack. Revision Changes Path 1.1 date: 2006/07/07 09:34:41; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/annotation/TxUndo.java Index: TxUndo.java =================================================================== /* * JBoss, Home of Professional Open Source * * Distributable under LGPL license. * See terms of license at gnu.org. */ package org.jboss.cache.pojo.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.annotation.ElementType; /** Annotation for PojoCache interceptor stack. This one annotates method to provide undo operation. * * @author Ben Wang * @version $Id: TxUndo.java,v 1.1 2006/07/07 09:34:41 bwang Exp $ */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface TxUndo { } |
|
From: Ben W. <bw...@jb...> - 2006-07-07 09:33:57
|
User: bwang
Date: 06/07/07 05:33:55
Modified: src/resources jboss-aop.xml
Log:
Added undo interceptor stack.
Revision Changes Path
1.8 +12 -6 JBossCache/src/resources/jboss-aop.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-aop.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/resources/jboss-aop.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- jboss-aop.xml 6 Jul 2006 02:42:48 -0000 1.7
+++ jboss-aop.xml 7 Jul 2006 09:33:55 -0000 1.8
@@ -63,16 +63,20 @@
<!--
This defines the PojoCache 2.0 interceptor stack.
-->
+ <!-- Check id range validity -->
<interceptor name="CheckId" class="org.jboss.cache.pojo.interceptors.CheckIdInterceptor" scope="PER_INSTANCE"/>
+ <!-- Track Tx undo operation -->
+ <interceptor name="Undo" class="org.jboss.cache.pojo.interceptors.PojoTxUndoInterceptor" scope="PER_INSTANCE"/>
<stack name="Tx">
+ <!-- Starting interceptor -->
<interceptor name="Start" class="org.jboss.cache.pojo.interceptors.PojoBeginInterceptor" scope="PER_INSTANCE"/>
<!-- Check if we need a local tx for batch processing -->
<interceptor name="Tx" class="org.jboss.cache.pojo.interceptors.PojoTxInterceptor" scope="PER_INSTANCE"/>
<!-- Perform parent level node locking -->
<interceptor name="TxLock" class="org.jboss.cache.pojo.interceptors.PojoTxLockInterceptor" scope="PER_INSTANCE"/>
<!-- Interceptor to perform Pojo level rollback -->
- <interceptor name="TxUndo" class="org.jboss.cache.pojo.interceptors.PojoTxUndoInterceptor" scope="PER_INSTANCE"/>
+ <interceptor name="TxUndo" class="org.jboss.cache.pojo.interceptors.PojoTxUndoSynchronizationInterceptor" scope="PER_INSTANCE"/>
</stack>
<!--bind pointcut="execution(public Object org.jboss.cache.pojo.impl.PojoCacheImpl->attach(String, Object)
@@ -83,13 +87,15 @@
</bind>
<bind pointcut="execution(*
- org.jboss.cache.pojo.impl.PojoCacheImpl->attach(..))">
- <stack-ref name="Tx"/>
+ org.jboss.cache.pojo.PojoUtil->@org.jboss.cache.pojo.annotation.TxUndo(..))">
+ <interceptor-ref name="Undo"/>
</bind>
- <bind pointcut="execution(*
- org.jboss.cache.pojo.impl.PojoCacheImpl->detach(..))">
+ <bind pointcut="
+ execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->attach(..)) OR
+ execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->detach(..)) OR
+ execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->find(..))
+ ">
<stack-ref name="Tx"/>
</bind>
-
</aop>
|
|
From: Boleslaw D. <bd...@o2...> - 2006-07-07 08:45:16
|
User: bdaw
Date: 06/07/07 04:45:14
Modified: portlet/src/resources/test/info/test-info-sar/META-INF
jboss-service.xml
Log:
- SecurityInfo interface initial test - failing
Revision Changes Path
1.8 +10 -0 jboss-portal/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-service.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- jboss-service.xml 30 Jun 2006 21:23:20 -0000 1.7
+++ jboss-service.xml 7 Jul 2006 08:45:14 -0000 1.8
@@ -136,4 +136,14 @@
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
</mbean>
+
+ <mbean
+ code="org.jboss.portal.test.portlet.info.SecurityInfoTest"
+ name="portal:test=SecurityInfo"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
+ <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
+ </mbean>
</server>
\ No newline at end of file
|
|
From: Boleslaw D. <bd...@o2...> - 2006-07-07 08:45:15
|
User: bdaw
Date: 06/07/07 04:45:13
Modified: portlet/src/main/org/jboss/portal/test/portlet/info
InfoTestSuite.java
Added: portlet/src/main/org/jboss/portal/test/portlet/info
SecurityInfoTest.java
Log:
- SecurityInfo interface initial test - failing
Revision Changes Path
1.8 +2 -1 jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InfoTestSuite.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- InfoTestSuite.java 30 Jun 2006 21:23:19 -0000 1.7
+++ InfoTestSuite.java 7 Jul 2006 08:45:13 -0000 1.8
@@ -27,7 +27,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class InfoTestSuite
{
@@ -43,6 +43,7 @@
suite.addTest(new TestCase("ModeInfoTest"));
suite.addTest(new TestCase("PortletInfoTest"));
suite.addTest(new TestCase("SessionInfoTest"));
+ suite.addTest(new TestCase("SecurityInfoTest"));
return suite;
}
1.1 date: 2006/07/07 08:45:13; author: bdaw; state: Exp;jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
Index: SecurityInfoTest.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.portal.test.portlet.info;
import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.container.result.Result;
import org.jboss.portal.test.framework.container.result.AssertResult;
import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.SecurityInfo;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.util.TransportGuarantee;
/**
* @author <a href="mailto:bol...@jb...">Boleslaw Dawidowicz</a>
* @version $Revision: 1.1 $
*/
public class SecurityInfoTest extends AbstractTest
{
private PortletApplicationRegistry registry;
public PortletApplicationRegistry getRegistry()
{
return registry;
}
public void setRegistry(PortletApplicationRegistry registry)
{
this.registry = registry;
}
public Result execute(ServerInvocation invocation)
{
AssertResult result = new AssertResult();
result.execute(new AssertResult.Test()
{
public void run() throws Exception
{
//This asserts only .isRemotable() as rest is checked in other tests
PortletContainer container = (PortletContainer)registry.getPortletContainer("/test-info.SecuredPortlet1");
PortletInfo info = container.getInfo();
SecurityInfo secInfo = info.getSecurity();
secInfo = info.getSecurity();
assertEquals(1, secInfo.getTransportGuarantees().size());
assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL));
//assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL));
//assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE));
container = (PortletContainer)registry.getPortletContainer("/test-info.SecuredPortlet2");
info = container.getInfo();
secInfo = info.getSecurity();
assertEquals(1, secInfo.getTransportGuarantees().size());
assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL));
container = (PortletContainer)registry.getPortletContainer("/test-info.SecuredPortlet3");
info = container.getInfo();
secInfo = info.getSecurity();
assertEquals(1, secInfo.getTransportGuarantees().size());
assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL));
}
});
return result;
}
}
|
|
From: Boleslaw D. <bd...@o2...> - 2006-07-07 08:45:15
|
User: bdaw
Date: 06/07/07 04:45:14
Modified: portlet/src/resources/test/info/test-info-war/WEB-INF
portlet.xml
Log:
- SecurityInfo interface initial test - failing
Revision Changes Path
1.4 +57 -0 jboss-portal/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: portlet.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- portlet.xml 30 Jun 2006 21:23:20 -0000 1.3
+++ portlet.xml 7 Jul 2006 08:45:14 -0000 1.4
@@ -189,7 +189,64 @@
</portlet-info>
</portlet>
+ <portlet>
+ <portlet-name>SecuredPortlet1</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.info.universal.SimplePortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>title</title>
+ <short-title>short-title</short-title>
+ <keywords>keywords</keywords>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>SecuredPortlet2</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.info.universal.SimplePortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>title</title>
+ <short-title>short-title</short-title>
+ <keywords>keywords</keywords>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>SecuredPortlet3</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.info.universal.SimplePortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>title</title>
+ <short-title>short-title</short-title>
+ <keywords>keywords</keywords>
+ </portlet-info>
+ </portlet>
+
+ <security-constraint>
+ <portlet-collection>
+ <portlet-name>SecuredPortlet1</portlet-name>
+ </portlet-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <portlet-collection>
+ <portlet-name>SecuredPortlet2</portlet-name>
+ <portlet-name>SecuredPortlet3</portlet-name>
+ </portlet-collection>
+ <user-data-constraint>
+ <transport-guarantee>INTEGRAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
</portlet-app>
|
|
From: Alex L. <al...@jb...> - 2006-07-07 08:43:24
|
User: aloubyansky
Date: 06/07/07 04:43:22
Modified: src/main/org/jboss/test/xml
WildcardUnresolvedElementsUnitTestCase.java
Log:
disabled trace
Revision Changes Path
1.9 +1 -6 jbosstest/src/main/org/jboss/test/xml/WildcardUnresolvedElementsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WildcardUnresolvedElementsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/xml/WildcardUnresolvedElementsUnitTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- WildcardUnresolvedElementsUnitTestCase.java 28 May 2006 18:02:30 -0000 1.8
+++ WildcardUnresolvedElementsUnitTestCase.java 7 Jul 2006 08:43:22 -0000 1.9
@@ -74,7 +74,7 @@
/**
* @author <a href="mailto:al...@jb...">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.8 $</tt>
+ * @version <tt>$Revision: 1.9 $</tt>
*/
public class WildcardUnresolvedElementsUnitTestCase
extends AbstractJBossXBTest
@@ -119,11 +119,6 @@
super(name);
}
- protected void configureLogging()
- {
- enableTrace(XercesXsMarshaller.class.getName());
- }
-
public void testUnmarshallingGenericElement() throws Exception
{
SchemaBinding schema = getSchemaBinding(true);
|
|
From: Marshall C. <mcu...@jb...> - 2006-07-07 08:32:53
|
User: mculpepper
Date: 06/07/07 04:32:50
Modified: releng/org.jboss.ide.eclipse.releng/builders/core
customTargets.xml
Log:
building the core source should now work
Revision Changes Path
1.9 +6 -4 jbosside/releng/org.jboss.ide.eclipse.releng/builders/core/customTargets.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: customTargets.xml
===================================================================
RCS file: /cvsroot/jboss/jbosside/releng/org.jboss.ide.eclipse.releng/builders/core/customTargets.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- customTargets.xml 2 Jun 2006 23:00:21 -0000 1.8
+++ customTargets.xml 7 Jul 2006 08:32:50 -0000 1.9
@@ -15,10 +15,11 @@
<property name="type" value="feature" />
<property name="id" value="org.jboss.ide.eclipse.feature" />
</ant>
- <!--ant antfile="${genericTargets}" target="${target}" >
+ <ant antfile="${genericTargets}" target="${target}" >
+ <property name="customTargets" value="${builderDirectory}/customTargets.xml"/>
<property name="type" value="feature" />
<property name="id" value="org.jboss.ide.eclipse.source" />
- </ant-->
+ </ant>
</target>
<!-- ===================================================================== -->
@@ -33,10 +34,10 @@
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
-<!--target name="assemble.org.jboss.ide.eclipse.source">
+<target name="assemble.org.jboss.ide.eclipse.source">
<property name="archiveName" value="JBossIDE-Core-Source-${versionTag}.zip"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-</target-->
+</target>
<!-- ===================================================================== -->
<!-- Check out map files from correct repository -->
@@ -82,6 +83,7 @@
failonerror="false" failonrecursiveerror="false">
<fileset dir="${buildDirectory}/plugins">
<include name="org.jboss.ide.eclipse.*"/>
+ <exclude name="org.jboss.ide.eclipse.source"/>
<exclude name="org.jboss.ide.eclipse.jdt.aop.*"/>
<exclude name="org.jboss.ide.eclipse.as.*"/>
<exclude name="org.jboss.ide.eclipse.freemarker.*"/>
|
|
From: Boleslaw D. <bd...@o2...> - 2006-07-07 07:33:13
|
User: bdaw
Date: 06/07/07 03:30:49
Modified: migration/src/main/org/jboss/portal/migration
MigrationModule22_24.java
Log:
fixed wrong table name in migration app schema
Revision Changes Path
1.21 +33 -6 jboss-portal/migration/src/main/org/jboss/portal/migration/MigrationModule22_24.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MigrationModule22_24.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/migration/src/main/org/jboss/portal/migration/MigrationModule22_24.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- MigrationModule22_24.java 20 Jun 2006 12:56:00 -0000 1.20
+++ MigrationModule22_24.java 7 Jul 2006 07:30:49 -0000 1.21
@@ -37,6 +37,7 @@
import org.jboss.portal.migration.model24.portal.PortalObject24Impl;
import org.jboss.portal.migration.model24.portal.ObjectNodeSecurityConstraint;
import org.jboss.portal.migration.model24.portal.Portal24Impl;
+import org.jboss.portal.migration.model24.portal.Context24Impl;
import org.jboss.portal.migration.model24.instance.Instance24Impl;
import org.jboss.portal.migration.model24.instance.UserInstance24;
import org.jboss.portal.migration.model24.instance.InstanceSecurityBinding;
@@ -71,7 +72,7 @@
*
* @author <a href="mailto:ro...@jb...">Roy Russo</a>
* @author <a href="mailto:bol...@jb...">Boleslaw Dawidowicz</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class MigrationModule22_24 extends MigrationModule
{
@@ -544,13 +545,38 @@
log.info("Starting migrating security policies...");
+ /*//at first just create allow permissions for every context object
+ //TODO: change this to migrate true portal permissions
+ Query portalQuery = toSession.createQuery("FROM Context24Impl");
+ for (Iterator portals = portalQuery.iterate(); portals.hasNext();)
+ {
+ Context24Impl context = (Context24Impl)portals.next();
+ log.debug("Updating security for context: " + context.getObjectNode().getPath() );
+ ObjectNodeSecurityConstraint constraint = new ObjectNodeSecurityConstraint();
+ constraint.setRole("__unchecked__");
+ Set actions = new HashSet();
+ actions.add("view");
+ constraint.setActions(actions);
+ constraint.setObjectNode(context.getObjectNode());
+
+ if (context.getObjectNode().getSecurityConstraints() == null)
+ {
+ context.getObjectNode().setSecurityConstraints(new HashMap());
+ }
+ //Map constraints = new HashMap();
+ context.getObjectNode().getSecurityConstraints().put(context.getObjectNode().getKey(), constraint);
+ //portal.getObjectNode().setSecurityConstraints(constraints);
+
+ toSession.save(constraint);
+ }*/
+
//at first just create allow permissions for every portal object
//TODO: change this to migrate true portal permissions
- Query portalQuery = toSession.createQuery("FROM Portal24Impl");
+ /*Query portalQuery = toSession.createQuery("FROM Portal24Impl");
for (Iterator portals = portalQuery.iterate(); portals.hasNext();)
{
Portal24Impl portal = (Portal24Impl)portals.next();
- log.debug("Migrating portal: " + portal.getObjectNode().getPath() );
+ log.info("Updating security for portal: " + portal.getObjectNode().getPath() );
ObjectNodeSecurityConstraint constraint = new ObjectNodeSecurityConstraint();
constraint.setRole("__unchecked__");
Set actions = new HashSet();
@@ -567,7 +593,7 @@
//portal.getObjectNode().setSecurityConstraints(constraints);
toSession.save(constraint);
- }
+ }*/
//then iterate and convert permissions for nodes and instances
Query query = fromSession.createQuery("SELECT key FROM SecurityPolicy ORDER BY key");
@@ -582,7 +608,7 @@
String parentRef = sp.getParentReference();
- log.debug("Migrating policy from: " + sp.getReference());
+ log.info("Migrating policy from: " + sp.getReference());
String path = "";
@@ -593,7 +619,7 @@
else if (parentRef.equals("/portalobject"))
{
path = cutPath(sp.getParentReference(), sp.getReference());
- log.debug("Migrating portalobject: " + path);
+ log.info("Migrating portalobject: " + path);
ObjectNode24 objectNode24 = (ObjectNode24)toSession.createCriteria(ObjectNode24.class).add(Restrictions.eq("path", path)).uniqueResult();
if (objectNode24 == null)
@@ -612,6 +638,7 @@
ObjectNodeSecurityConstraint nodeConstraint = MigrationUtils.cloneConstraintToObjectNodeConstraint(hsc);
nodeConstraint.setObjectNode(objectNode24);
objectNode24.getSecurityConstraints().put(objectNode24.getKey(), nodeConstraint);
+ log.debug("Security Constraint for node: " + objectNode24.getKey());
toSession.save(nodeConstraint);
}
|
|
From: Boleslaw D. <bd...@o2...> - 2006-07-07 07:33:10
|
User: bdaw
Date: 06/07/07 03:30:49
Modified: migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/portal
domain.hbm.xml
Log:
fixed wrong table name in migration app schema
Revision Changes Path
1.4 +3 -3 jboss-portal/migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/portal/domain.hbm.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: domain.hbm.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/portal/domain.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- domain.hbm.xml 13 Jun 2006 12:17:07 -0000 1.3
+++ domain.hbm.xml 7 Jul 2006 07:30:49 -0000 1.4
@@ -149,12 +149,12 @@
</class>
<class
name="org.jboss.portal.migration.model24.portal.ObjectNodeSecurityConstraint"
- table="JBP_OBJECT_NODE_SECURITY">
+ table="JBP_OBJECT_NODE_SEC">
<!--<cache usage="read-write"/>-->
<id name="key">
<column name="PK"/>
<generator class="native">
- <param name="sequence">security_seq</param>
+ <param name="sequence">sec_seq</param>
</generator>
</id>
<property
@@ -165,7 +165,7 @@
</property>
<set
name="actions"
- table="JBP_OBJECT_NODE_SECURITY_ACTIONS"
+ table="JBP_OBJECT_NODE_SEC_ACTIONS"
cascade="all-delete-orphan"
fetch="join">
<key column="PK"/>
|
|
From: Brian S. <bri...@jb...> - 2006-07-07 07:20:04
|
User: bstansberry
Date: 06/07/07 03:20:02
Modified: src/org/jboss/cache/marshall Tag: Branch_JBossCache_1_4_0
LegacyTreeCacheMarshaller.java
TreeCacheMarshaller140.java
Log:
Don't throw CCE extracting an Fqn if a subclass passes in a non-JBC MethodCall
Revision Changes Path
No revision
No revision
1.5.2.1 +32 -15 JBossCache/src/org/jboss/cache/marshall/LegacyTreeCacheMarshaller.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LegacyTreeCacheMarshaller.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/LegacyTreeCacheMarshaller.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- LegacyTreeCacheMarshaller.java 8 Jun 2006 22:00:35 -0000 1.5
+++ LegacyTreeCacheMarshaller.java 7 Jul 2006 07:20:02 -0000 1.5.2.1
@@ -33,7 +33,7 @@
* @author Ben Wang
* @author Manik Surtani
*
- * @version $Id: LegacyTreeCacheMarshaller.java,v 1.5 2006/06/08 22:00:35 msurtani Exp $
+ * @version $Id: LegacyTreeCacheMarshaller.java,v 1.5.2.1 2006/07/07 07:20:02 bstansberry Exp $
*/
public class LegacyTreeCacheMarshaller extends Marshaller
{
@@ -117,9 +117,16 @@
* 1. replicate. Argument is another MethodCall. The followings are the one that we need to handle:
* 2. replicateAll. List of MethodCalls. We can simply repeat the previous step by extract the first fqn only.
*/
- JBCMethodCall call = (JBCMethodCall) o; // either "replicate" or "replicateAll" now.
+ JBCMethodCall call = null;
+ String fqn = null;
+
+ // Just cast o to JBCMethodCall -- in the off chance its not
+ // due to a subclass passing in something else, we'll just
+ // deal with the CCE
+ try
+ {
+ call = (JBCMethodCall) o; // either "replicate" or "replicateAll" now.
- String fqn;
switch (call.getMethodId())
{
case MethodDeclarations.replicateMethod_id:
@@ -132,6 +139,16 @@
throw new IllegalStateException("LegacyTreeCacheMarshaller.objectToByteBuffer(): MethodCall name is either not "
+ " replicate or replicateAll but : " + call.getName());
}
+ }
+ catch (ClassCastException cce)
+ {
+ if (call == null)
+ {
+ log.debug("Received non-JBCMethodCall " + o +" -- cannot extract Fqn so using null");
+ }
+ else
+ throw cce;
+ }
// Extract fqn and write it out in fixed format
if (fqn == null) fqn = "NULL"; // can't write null. tis can be commit.
1.1.2.1 +34 -19 JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller140.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheMarshaller140.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller140.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- TreeCacheMarshaller140.java 8 Jun 2006 00:42:23 -0000 1.1
+++ TreeCacheMarshaller140.java 7 Jul 2006 07:20:02 -0000 1.1.2.1
@@ -11,7 +11,6 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
import org.jboss.cache.GlobalTransaction;
-import org.jboss.cache.rpc.RpcTreeCache;
import org.jgroups.Address;
import org.jgroups.blocks.MethodCall;
import org.jgroups.stack.IpAddress;
@@ -69,10 +68,28 @@
if (useRegionBasedMarshalling)
{
// we first marshall the Fqn as a String (ugh!)
- JBCMethodCall call = (JBCMethodCall) o;
+
+ // Just cast o to JBCMethodCall -- in the off chance its not
+ // due to a subclass passing in something else, we'll just
+ // deal with the CCE
+ JBCMethodCall call = null;
+ try
+ {
+ call = (JBCMethodCall) o;
String fqnAsString = extractFqnAsString(call);
marshallObject(fqnAsString, out, refMap);
}
+ catch (ClassCastException cce)
+ {
+ if (call == null)
+ {
+ log.debug("Received non-JBCMethodCall " + o +" -- cannot extract Fqn so using null");
+ marshallObject(null, out, refMap);
+ }
+ else
+ throw cce;
+ }
+ }
marshallObject(o, out, refMap);
}
@@ -152,21 +169,19 @@
private String extractFqnAsString(JBCMethodCall call) throws Exception
{
String fqnAsString;
- if (call.getMethod().equals(MethodDeclarations.replicateMethod))
+ switch (call.getMethodId())
{
+ case MethodDeclarations.replicateMethod_id:
fqnAsString = extractFqnFromMethodCall(call);
- }
- else if (call.getMethod().equals(MethodDeclarations.replicateAllMethod))
- {
+ break;
+ case MethodDeclarations.replicateAllMethod_id:
fqnAsString = extractFqnFromListOfMethodCall(call);
- }
- else if (call.getMethod().equals(RpcTreeCache.dispatchRpcCallMethod))
- {
+ break;
+ case MethodDeclarations.dispatchRpcCallMethod_id:
JBCMethodCall call2 = (JBCMethodCall) call.getArgs()[1];
fqnAsString = extractFqn(call2);
- }
- else
- {
+ break;
+ default:
fqnAsString = extractFqn(call);
}
|
|
From: Brian S. <bri...@jb...> - 2006-07-07 07:03:47
|
User: bstansberry
Date: 06/07/07 03:03:44
Modified: src/org/jboss/cache Tag: Branch_JBossCache_1_4_0
TreeCache.java
Log:
Don't assume the method call is replicate when creating TRACE log message
Revision Changes Path
No revision
No revision
1.195.2.4 +3 -3 JBossCache/src/org/jboss/cache/TreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
retrieving revision 1.195.2.3
retrieving revision 1.195.2.4
diff -u -b -r1.195.2.3 -r1.195.2.4
--- TreeCache.java 27 Jun 2006 23:07:13 -0000 1.195.2.3
+++ TreeCache.java 7 Jul 2006 07:03:43 -0000 1.195.2.4
@@ -79,7 +79,7 @@
* @author <a href="mailto:ma...@jb...">Manik Surtani (ma...@jb...)</a>
* @author Brian Stansberry
* @author Daniel Huang (dh...@jb...)
- * @version $Id: TreeCache.java,v 1.195.2.3 2006/06/27 23:07:13 bstansberry Exp $
+ * @version $Id: TreeCache.java,v 1.195.2.4 2006/07/07 07:03:43 bstansberry Exp $
* <p/>
* @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
*/
@@ -4152,7 +4152,7 @@
}
if (log.isTraceEnabled())
- log.trace("callRemoteMethods(): valid members are " + validMembers + " methods: " + method_call.getArgs()[0]);
+ log.trace("callRemoteMethods(): valid members are " + validMembers + " method: " + method_call);
// checkForNonSerializableArgs(method_call);
|
|
From: <for...@jb...> - 2006-07-07 05:00:36
|
Commit from rsigal (2006-07-06 01:45 EDT) ------------------ JBREM-513: Keep local configuration, which may have non serializable factories, separate from configuration, which is mean to contain only serializable objects. JBossRemoting src/main/org/jboss/remoting/transport/rmi/ssl/SerializableSSLClientSocketFactory.java 1.2 Commit from bwang (2006-07-06 01:48 EDT) ----------------- Exposed getLockWoner API JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/PojoTreeCache.java 1.4 Commit from rsigal (2006-07-06 01:50 EDT) ------------------ JBREM-513: Create new copy of configuration HashMap before putting into SerializableSSLClientSocketFactory static map. JBossRemoting src/main/org/jboss/remoting/transport/rmi/ssl/SSLRMIClientInvoker.java 1.2 Commit from rsigal (2006-07-06 02:07 EDT) ------------------ JBREM-513: Made SocketFactory transient. JBossRemoting src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java 1.8 Commit from rsigal (2006-07-06 02:10 EDT) ------------------ JBREM-390: Just reordered a couple of constants. Purely cosmetic. JBossRemoting src/main/org/jboss/remoting/transport/multiplex/Multiplex.java 1.5 Commit from starksm (2006-07-06 02:17 EDT) ------------------- Add an upper case property to test JavaBean conventions microkernel src/resources/org/jboss/test/javabean/test/TestConfigure.xml 1.2 microkernel src/tests/org/jboss/test/javabean/test/PropertyTestCase.java 1.2 microkernel src/tests/org/jboss/test/javabean/support/SimpleBean.java 1.2 Commit from starksm (2006-07-06 02:49 EDT) ------------------- Invoke run on the bootstrap system2 src/main/org/jboss/system/server/profileservice/ServerImpl.java 1.2 Commit from starksm (2006-07-06 02:51 EDT) ------------------- A bootstrap deployer kernel beans descriptor + system2 src/resources/tests/xml/deployer-beans.xml 1.1 Commit from rsigal (2006-07-06 03:36 EDT) ------------------ 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. JBossRemoting docs/guide/en/master.xml 1.24 Commit from wolfc (2006-07-06 04:35 EDT) ----------------- EJBTHREE-620: removed java.ejb.EJB.businessInterface jboss-ejb3x src/main/javax/ejb/EJB.java 1.6 jboss-ejb3 src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java 1.6 jboss-ejb3 src/test/org/jboss/ejb3/test/security/Level1CallerBean.java 1.6 jboss-ejb3 src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java 1.9 jboss-ejb3 src/test/org/jboss/ejb3/test/security/PublicSessionBean.java 1.5 jboss-ejb3 src/test/org/jboss/ejb3/test/security/CallerBean2.java 1.6 jboss-ejb3 src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java 1.5 jboss-ejb3 src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java 1.5 jboss-ejb3 src/test/org/jboss/ejb3/test/security/SecurityContextBean.java 1.5 jboss-ejb3 src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java 1.5 jboss-ejb3 src/main/org/jboss/ejb3/injection/EJBHandler.java 1.37 jboss-ejb3 src/test/org/jboss/ejb3/test/initial/ClassInjectedBean.java 1.12 jboss-ejb3 docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java 1.6 jboss-ejb3 src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java 1.13 jboss-ejb3 src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java 1.2 Commit from bwang (2006-07-06 05:25 EDT) ----------------- Minor refactoring. JBossCache src-50/org/jboss/cache/pojo/BaseInterceptor.java 1.3 JBossCache src-50/org/jboss/cache/pojo/CollectionClassHandler.java 1.5 JBossCache src-50/org/jboss/cache/pojo/ObjectGraphHandler.java 1.4 JBossCache src-50/org/jboss/cache/pojo/PojoTreeCache.java 1.5 JBossCache src-50/org/jboss/cache/pojo/PojoUtil.java 1.2 JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.5 Commit from aloubyansky (2006-07-06 05:36 EDT) ----------------------- latest snapshot, includes JBXB-73 repository.jboss.com jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar 1.16 Commit from msurtani (2006-07-06 06:49 EDT) -------------------- Made this more Habanero-friendly JBossCache src/org/jboss/cache/marshall/VersionAwareMarshaller.java 1.6 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-06 06:52 EDT) ------------------------------------------------------ Made this more 2.0.0 friendly JBossCache src/org/jboss/cache/marshall/VersionAwareMarshaller.java 1.5.2.1 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-06 06:56 EDT) ------------------------------------------------------ AutoDataGravitation set to false JBossCache src/org/jboss/cache/buddyreplication/BuddyManager.java 1.33.2.1 Commit from julien (2006-07-06 08:50 EDT) ------------------ - fixed bug in portlet session implementation - added test cases for those bugs - more strict handling of results in the process action of the universal test portlet jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java 1.30 jboss-portal portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 1.5 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 1.5 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 1.3 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java 1.3 jboss-portal test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java 1.12 Commit from kkhan (2006-07-06 09:02 EDT) ----------------- [JBAOP-88] Make AspectBeanMetaDataFactory differentiate between if a "use-case xml" aspect has dependency injection or not. If it does, use the lazy mechanism. If not use the normal di injection for the created beans. aop-mc-int src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataFactory.java 1.4 + aop-mc-int src/tests/org/jboss/test/microcontainer/test/InterceptedUseCaseXmlTestCase.java 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptedUseCaseXmlTestCase.xml 1.1 jboss-aop src/main/org/jboss/aop/proxy/container/ContainerCache.java 1.16 Commit from julien (2006-07-06 09:35 EDT) ------------------ make it work with previous tomahawk jboss-portal core/build.xml 1.119 jboss-portal core/src/resources/portal-core-war/WEB-INF/web.xml 1.20 jboss-portal core/src/resources/portal-core-war/WEB-INF/jsp/management/index.xhtml 1.15 jboss-portal core/src/resources/portal-core-war/WEB-INF/jsp/management/instances.xhtml 1.12 jboss-portal core/src/resources/portal-core-war/WEB-INF/jsp/management/nav.xhtml 1.7 jboss-portal core/src/resources/portal-core-war/WEB-INF/jsp/management/portlets.xhtml 1.18 jboss-portal core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/manager.xhtml 1.12 Commit from rgenova (2006-07-06 10:08 EDT) ------------------- updated tomahawk version + repository.jboss.com apache-tomahawk/1.1.1/component-info.xml 1.1 Commit from rgenova (2006-07-06 10:09 EDT) ------------------- tomahawk 1.1.1 + repository.jboss.com apache-tomahawk/1.1.1/lib/tomahawk.jar 1.1 Commit from rgenova (2006-07-06 10:18 EDT) ------------------- changed tomahawk version to 1.1.1 jboss-portal build/build-thirdparty.xml 1.7 Commit from wolfc (2006-07-06 10:28 EDT) ----------------- EJBTHREE-323: unit test jboss-ejb3 build-test.xml 1.218 jboss-ejb3 src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java 1.15 + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java 1.1 + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java 1.1 + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java 1.1 + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java 1.1 Commit from kkhan (2006-07-06 10:31 EDT) ----------------- Make advisor field for generated advisors non-final jboss-aop src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 1.34 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-06 10:33 EDT) ------------------------------------------------------ JBCACHE-668 and JBCACHE-682 JBossCache src/org/jboss/cache/interceptors/TxInterceptor.java 1.48.2.2 JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.1.4.3 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-06 10:45 EDT) ------------------------------------------------------ Preparing for GA JBossCache src/org/jboss/cache/Version.java 1.18.2.2 JBossCache build.xml 1.119.2.4 Commit from ltexier on branch JBoss_4_0_3_SP1_JBAS3259 (2006-07-06 11:31 EDT) ------------------------------------------------------ [JBAS-3259] - backport fix from JBAS-3370 jbossmq src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 1.29.2.6.42.2 Commit from rloehr (2006-07-06 11:46 EDT) ------------------ replace slow unjarring procedure with zipfileset jboss-system build.xml 1.56 Commit from rloehr (2006-07-06 11:52 EDT) ------------------ replace slow unjarring procedure with zipfileset jboss build.xml 1.207 Commit from rrajasekaran (2006-07-06 11:58 EDT) ------------------------ Updated jboss versions tools etc/cruisecontrol/scripts/build-jboss-portal.xml 1.27 tools etc/cruisecontrol/scripts/cruisecontrol.properties 1.3 Commit from csuconic (2006-07-06 12:07 EDT) -------------------- JBSER-82 - fix + jboss-serialization tests/org/jboss/serial/regression/jbser82/TestTwoJVM.java 1.1 + jboss-serialization tests/org/jboss/serial/regression/jbser82/TestTwoJVM_2_Test.java 1.1 + jboss-serialization tests/org/jboss/serial/regression/jbser82/TestTwoJVM_1_Test.java 1.1 jboss-serialization src/org/jboss/serial/classmetamodel/ClassMetamodelFactory.java 1.46 Commit from russo (2006-07-06 12:38 EDT) ----------------- JBPORTAL-934 - updated desc and created samples on pswap. jboss-portal-docs referenceGuide/en/modules/xmldescriptors.xml 1.23 jboss-portal-docs referenceGuide/en/master.xml 1.30 Commit from gzamarreno on branch Branch_JBossCache_1_4_0 (2006-07-06 12:43 EDT) -------------------------------------------------------- [JBCACHE-678] faq docbook updated to include Troubleshooting section and link. JBossCache docs/faq/en/master.xml 1.34.2.2 Commit from russo (2006-07-06 12:48 EDT) ----------------- JBPORTAL-848 - remove empty security chapter. jboss-portal-docs referenceGuide/en/master.xml 1.31 Commit from gzamarreno (2006-07-06 12:50 EDT) ---------------------- [JBCACHE-678] faq docbook updated to include Troubleshooting section and link. JBossCache docs/faq/en/master.xml 1.35 Commit from mculpepper (2006-07-06 12:50 EDT) ---------------------- attempting to make source compilation work - jbosside core/features/org.jboss.ide.eclipse.feature/sourceTemplateFeature/feature.xml 1.2 jbosside core/features/org.jboss.ide.eclipse.feature/sourceTemplatePlugin/build.properties 1.5 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-06 12:56 EDT) ------------------------------------------------------ CLeaned up tests for JBCACHE-668 and JBCACHE-682 JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.1.4.4 Commit from msurtani (2006-07-06 12:57 EDT) -------------------- JBCACHE-688 and JBCCAHE-682 JBossCache src/org/jboss/cache/interceptors/TxInterceptor.java 1.49 + JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.2 + JBossCache tests/functional/org/jboss/cache/transaction/NotifyingTransactionManager.java 1.2 Commit from csuconic (2006-07-06 13:00 EDT) -------------------- adding missing implementation jboss-profiler java/src/productionProfiler/org/jboss/profiler/production/interceptors/JDBCInterceptor.java 1.2 Commit from starksm on branch Branch_4_0 (2006-07-06 13:03 EDT) ---------------------------------------- Make the unmarshal(String, ObjectModelFactory, Object) call explicit to avoid amiguous resolution issues. jbosssx src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java 1.13.2.6 jboss-system src/main/org/jboss/deployment/ObjectModelFactorySimpleSubDeployerSupport.java 1.2.2.4 Commit from starksm (2006-07-06 13:03 EDT) ------------------- Make the unmarshal(String, ObjectModelFactory, Object) call explicit to avoid amiguous resolution issues. jbosssx src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java 1.27 jboss-system src/main/org/jboss/deployment/ObjectModelFactorySimpleSubDeployerSupport.java 1.5 Commit from mculpepper (2006-07-06 13:14 EDT) ---------------------- attempting to make source compilation work jbosside releng/org.jboss.ide.eclipse.releng/builders/core/jbosside-core.map 1.9 Commit from gurkanerdogdu (2006-07-06 13:17 EDT) ------------------------- Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons. + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLStructuredTextViewerConfiguration.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/AdapterFactoryProviderForCacheXML.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheContentAssistProcessor.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/ModelHandlerForCacheXML.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheAttributeMatcher.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentOutlineConfiguration.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/AdapterFactoryProviderForXML.java 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config/CacheConfigurationModel.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java 1.4 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderLableProvider.java 1.1 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CopyOfCacheLoaderConfigurationPage.java 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java 1.3 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderTableProvider.java 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal/messages.properties 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal/CacheMessages.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java 1.2 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/cache.cfg.xml 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/ICacheConstants.java 1.5 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath/CacheVersion124CpContainer.java 1.2 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/CacheLoaderPropModel.java 1.1 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java 1.4 + jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java 1.1 Commit from gurkanerdogdu (2006-07-06 13:17 EDT) ------------------------- *** empty log message *** jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/META-INF/MANIFEST.MF 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/.classpath 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.xml 1.3 Commit from gurkanerdogdu (2006-07-06 15:48 EDT) ------------------------- Unnecessary imports and content assist in editor jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLStructuredTextViewerConfiguration.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheContentAssistProcessor.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheAttributeMatcher.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentOutlineConfiguration.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/CreateNodeAction.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/DuplicateAction.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/ConnectAction.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/DeleteConfigurationAction.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/EditConfigurationAction.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath/CacheClassPathContainer.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config/TreeCacheViewNodeListener.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config/TreeCacheViewLabelProvider.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/RemoteConfigurationWizard.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java 1.5 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CopyOfCacheLoaderConfigurationPage.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/RemoteConfigurationPage.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java 1.5 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/content/TableContentProvider.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CViewDialogContentProvider.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/RefreshDialog.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java 1.5 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheInstance.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheRootInstance.java 1.3 Commit from russo (2006-07-06 16:20 EDT) ----------------- update readmes jboss-portal-docs readmeFiles/jboss-portal-ha-bin.README 1.2 jboss-portal-docs readmeFiles/jboss-portal-bin.README 1.8 jboss-portal-docs readmeFiles/jboss-portal-src.README 1.8 Commit from russo (2006-07-06 16:38 EDT) ----------------- update for clustering dist jboss-portal-docs referenceGuide/en/modules/clustering.xml 1.7 jboss-portal-docs referenceGuide/en/modules/installation.xml 1.5 Commit from russo (2006-07-06 16:46 EDT) ----------------- warning on migration mod. jboss-portal-docs referenceGuide/en/modules/migration.xml 1.12 Commit from asogor (2006-07-06 19:11 EDT) ------------------ Invite Response works jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus/MailResponse.java 1.2 jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/MailResposeHandlerMDB.java 1.3 jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/EventMailMDB.java 1.4 jboss-mail src/java/org/jboss/mail/maillistener/CalendarMailListener.java 1.4 Commit from mculpepper (2006-07-06 19:37 EDT) ---------------------- changed to 2.0.0 jbosside core/features/org.jboss.ide.eclipse.source/feature.xml 1.2 Commit from mculpepper (2006-07-06 19:38 EDT) ---------------------- dependency on org.jboss.ide.eclipse.feature should be 0.0.0 jbosside core/features/org.jboss.ide.eclipse.source/feature.xml 1.3 Commit from bwang on branch Branch_JBossCache_1_4_0 (2006-07-06 21:47 EDT) --------------------------------------------------- JBCACHE-683 TxSynchronizationHandler can produce NPE. JBossCache src/org/jboss/cache/aop/PojoCache.java 1.23.2.1 JBossCache src/org/jboss/cache/aop/PojoTxSynchronizationHandler.java 1.1.2.1 Commit from wprice (2006-07-06 22:32 EDT) ------------------ [JBAS-3343] New jboss-ra.xsd schema to allow for overriding RA properties in ra.xml. At present, this is the only use for this file. + jbosscx src/resources/schema/jboss-ra.xsd 1.1 + jbosscx src/resources/schema/connector_1_5.xsd 1.1 Commit from wprice (2006-07-06 22:34 EDT) ------------------ [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. jbosscx src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java 1.19 Commit from wprice (2006-07-06 22:37 EDT) ------------------ [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Added support methods to testing framework. jbosstest src/main/org/jboss/test/jca/adapter/TestConnectionFactory.java 1.6 jbosstest src/main/org/jboss/test/jca/adapter/TestConnection.java 1.12 jbosstest src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 1.18 jbosstest src/main/org/jboss/test/jca/ejb/XAExceptionSessionBean.java 1.6 jbosstest src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java 1.22 Commit from wprice (2006-07-06 22:40 EDT) ------------------ [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. jbosscx src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java 1.43 Commit from wprice (2006-07-06 22:43 EDT) ------------------ [JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality. jbosscx src/main/org/jboss/resource/deployment/RARDeployment.java 1.15 jbosscx src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java 1.8 + jbosscx src/main/org/jboss/resource/deployment/JBossRAObjectModelFactory.java 1.1 jbosscx src/main/org/jboss/resource/deployment/RARDeployer.java 1.19 + jbosscx src/main/org/jboss/resource/metadata/JBossRAMetaData.java 1.1 + jbosscx src/main/org/jboss/resource/metadata/RARDeploymentMetaData.java 1.1 jbosscx src/main/org/jboss/resource/metadata/ConnectorMetaData.java 1.10 Commit from wprice (2006-07-06 22:47 EDT) ------------------ [JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality. Added new unit test case and support files. + jbosstest src/main/org/jboss/test/jcaprops/test/JBossRaXmlOverrideUnitTestCase.java 1.1 + jbosstest src/resources/jcaprops/xmloverride/META-INF/jboss-ra.xml 1.1 + jbosstest src/resources/jcaprops/xmloverride/META-INF/ra.xml 1.1 jbosstest imports/sections/jca.xml 1.5 Commit from wprice (2006-07-06 23:19 EDT) ------------------ [JBAS-3343] Removed spurios printStackTrace(), format, cleanup. jbosscx src/main/org/jboss/resource/deployment/RARDeployer.java 1.20 |
|
From: Weston P. <wes...@jb...> - 2006-07-07 03:19:33
|
User: wprice
Date: 06/07/06 23:19:30
Modified: src/main/org/jboss/resource/deployment RARDeployer.java
Log:
[JBAS-3343] Removed spurios printStackTrace(), format, cleanup.
Revision Changes Path
1.20 +4 -6 jbosscx/src/main/org/jboss/resource/deployment/RARDeployer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RARDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/deployment/RARDeployer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- RARDeployer.java 7 Jul 2006 02:43:23 -0000 1.19
+++ RARDeployer.java 7 Jul 2006 03:19:30 -0000 1.20
@@ -44,11 +44,13 @@
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @author <a href="wes...@jb...">Weston Price</a>
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
public class RARDeployer extends ObjectModelFactorySimpleSubDeployerSupport
implements RARDeployerMBean
{
+
+ /** The JBOSS_RA_XML */
private static final String JBOSS_RA_XML = "META-INF/jboss-ra.xml";
/** The work manager name */
@@ -108,14 +110,10 @@
}
catch (IOException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
}
}
- //Do jboss-ra.xml
-
}
public String getExtension()
{
|
|
From: Weston P. <wes...@jb...> - 2006-07-07 02:49:55
|
User: wprice
Date: 06/07/06 22:49:54
Modified: imports/sections jca.xml
Log:
[JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality.
Added new unit test case and support files.
Revision Changes Path
1.5 +14 -0 jbosstest/imports/sections/jca.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jca.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/imports/sections/jca.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- jca.xml 31 May 2006 21:07:26 -0000 1.4
+++ jca.xml 7 Jul 2006 02:49:54 -0000 1.5
@@ -258,5 +258,19 @@
<include name="testjcaprops-upper-good.jar"/>
</fileset>
</jar>
+
+ <!-- new jboss-ra.xml -->
+ <jar destfile="${build.lib}/testjcaprops-override.rar">
+
+ <fileset dir="${build.lib}">
+ <include name="testjcaprops.jar"/>
+ </fileset>
+ <metainf dir="${build.resources}/jcaprops/xmloverride/META-INF">
+ <include name="*.xml"/>
+ </metainf>
+ </jar>
+
</target>
+
+
</project>
|
|
From: Weston P. <wes...@jb...> - 2006-07-07 02:49:35
|
User: wprice
Date: 06/07/06 22:49:33
Added: src/resources/jcaprops/xmloverride/META-INF ra.xml
Log:
[JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality.
Added new unit test case and support files.
Revision Changes Path
1.1 date: 2006/07/07 02:49:33; author: wprice; state: Exp;jbosstest/src/resources/jcaprops/xmloverride/META-INF/ra.xml
Index: ra.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<connector version="1.5"
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
>
<vendor-name>JBoss, Inc</vendor-name>
<eis-type>JCA Properties</eis-type>
<resourceadapter-version>4.0</resourceadapter-version>
<license>
<description>
COPYRIGHT AND PERMISSION NOTICE
Copyright (c) 2005 JBoss, Inc
This is released under the terms of the LGPL.
See gnu.org for details.
</description>
<license-required>true</license-required>
</license>
<resourceadapter>
<resourceadapter-class>org.jboss.test.jcaprops.support.PropertyTestResourceAdapter</resourceadapter-class>
<config-property>
<config-property-name>StringRAR</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>StringFromRARProperties</config-property-value>
</config-property>
<config-property>
<config-property-name>BooleanRAR</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value>True</config-property-value>
</config-property>
<config-property>
<config-property-name>ByteRAR</config-property-name>
<config-property-type>java.lang.Byte</config-property-type>
<config-property-value>1</config-property-value>
</config-property>
<config-property>
<config-property-name>CharacterRAR</config-property-name>
<config-property-type>java.lang.Character</config-property-type>
<config-property-value>A</config-property-value>
</config-property>
<config-property>
<config-property-name>ShortRAR</config-property-name>
<config-property-type>java.lang.Short</config-property-type>
<config-property-value>2</config-property-value>
</config-property>
<config-property>
<config-property-name>IntegerRAR</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value>3</config-property-value>
</config-property>
<config-property>
<config-property-name>LongRAR</config-property-name>
<config-property-type>java.lang.Long</config-property-type>
<config-property-value>4</config-property-value>
</config-property>
<config-property>
<config-property-name>FloatRAR</config-property-name>
<config-property-type>java.lang.Float</config-property-type>
<config-property-value>5e6</config-property-value>
</config-property>
<config-property>
<config-property-name>DoubleRAR</config-property-name>
<config-property-type>java.lang.Double</config-property-type>
<config-property-value>7e8</config-property-value>
</config-property>
<outbound-resourceadapter>
<connection-definition>
<managedconnectionfactory-class>org.jboss.test.jcaprops.support.PropertyTestManagedConnectionFactory</managedconnectionfactory-class>
<config-property>
<config-property-name>StringMCF</config-property-name>
<config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
<config-property-name>BooleanMCF</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
<config-property-name>ByteMCF</config-property-name>
<config-property-type>java.lang.Byte</config-property-type>
</config-property>
<config-property>
<config-property-name>CharacterMCF</config-property-name>
<config-property-type>java.lang.Character</config-property-type>
</config-property>
<config-property>
<config-property-name>ShortMCF</config-property-name>
<config-property-type>java.lang.Short</config-property-type>
</config-property>
<config-property>
<config-property-name>IntegerMCF</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
<config-property-name>LongMCF</config-property-name>
<config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
<config-property-name>FloatMCF</config-property-name>
<config-property-type>java.lang.Float</config-property-type>
</config-property>
<config-property>
<config-property-name>DoubleMCF</config-property-name>
<config-property-type>java.lang.Double</config-property-type>
</config-property>
<config-property>
<config-property-name>StringCD</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>StringFromCDProperties</config-property-value>
</config-property>
<config-property>
<config-property-name>BooleanCD</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value>true</config-property-value>
</config-property>
<config-property>
<config-property-name>ByteCD</config-property-name>
<config-property-type>java.lang.Byte</config-property-type>
<config-property-value>31</config-property-value>
</config-property>
<config-property>
<config-property-name>CharacterCD</config-property-name>
<config-property-type>java.lang.Character</config-property-type>
<config-property-value>D</config-property-value>
</config-property>
<config-property>
<config-property-name>ShortCD</config-property-name>
<config-property-type>java.lang.Short</config-property-type>
<config-property-value>32</config-property-value>
</config-property>
<config-property>
<config-property-name>IntegerCD</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value>33</config-property-value>
</config-property>
<config-property>
<config-property-name>LongCD</config-property-name>
<config-property-type>java.lang.Long</config-property-type>
<config-property-value>34</config-property-value>
</config-property>
<config-property>
<config-property-name>FloatCD</config-property-name>
<config-property-type>java.lang.Float</config-property-type>
<config-property-value>6e26</config-property-value>
</config-property>
<config-property>
<config-property-name>DoubleCD</config-property-name>
<config-property-type>java.lang.Double</config-property-type>
<config-property-value>8e28</config-property-value>
</config-property>
<connectionfactory-interface>org.jboss.test.jcaprops.support.PropertyTestConnectionFactory</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.test.jcaprops.support.PropertyTestManagedConnectionFactoryImpl</connectionfactory-impl-class>
<connection-interface>org.jboss.test.jcaprops.support.PropertyTestConnection</connection-interface>
<connection-impl-class>org.jboss.test.jcaprops.support.PropertyTestConnectionImpl</connection-impl-class>
</connection-definition>
<transaction-support>LocalTransaction</transaction-support>
<authentication-mechanism>
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
</outbound-resourceadapter>
<inbound-resourceadapter>
<messageadapter>
<messagelistener>
<messagelistener-type>org.jboss.test.jcaprops.support.PropertyTestListener</messagelistener-type>
<activationspec>
<activationspec-class>org.jboss.test.jcaprops.support.PropertyTestActivationSpec</activationspec-class>
<required-config-property>
<config-property-name>StringAS</config-property-name>
</required-config-property>
<required-config-property>
<config-property-name>integerAS</config-property-name>
</required-config-property>
</activationspec>
</messagelistener>
</messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>org.jboss.test.jcaprops.support.PropertyTestAdminObject</adminobject-interface>
<adminobject-class>org.jboss.test.jcaprops.support.PropertyTestAdminObjectImpl</adminobject-class>
<config-property>
<config-property-name>StringAOMBean</config-property-name>
<config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
<config-property-name>BooleanAOMBean</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
<config-property-name>ByteAOMBean</config-property-name>
<config-property-type>java.lang.Byte</config-property-type>
</config-property>
<config-property>
<config-property-name>CharacterAOMBean</config-property-name>
<config-property-type>java.lang.Character</config-property-type>
</config-property>
<config-property>
<config-property-name>ShortAOMBean</config-property-name>
<config-property-type>java.lang.Short</config-property-type>
</config-property>
<config-property>
<config-property-name>IntegerAOMBean</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
<config-property-name>LongAOMBean</config-property-name>
<config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
<config-property-name>FloatAOMBean</config-property-name>
<config-property-type>java.lang.Float</config-property-type>
</config-property>
<config-property>
<config-property-name>DoubleAOMBean</config-property-name>
<config-property-type>java.lang.Double</config-property-type>
</config-property>
<config-property>
<config-property-name>StringAO</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>StringFromAOProperties</config-property-value>
</config-property>
<config-property>
<config-property-name>BooleanAO</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value>true</config-property-value>
</config-property>
<config-property>
<config-property-name>ByteAO</config-property-name>
<config-property-type>java.lang.Byte</config-property-type>
<config-property-value>31</config-property-value>
</config-property>
<config-property>
<config-property-name>CharacterAO</config-property-name>
<config-property-type>java.lang.Character</config-property-type>
<config-property-value>D</config-property-value>
</config-property>
<config-property>
<config-property-name>ShortAO</config-property-name>
<config-property-type>java.lang.Short</config-property-type>
<config-property-value>32</config-property-value>
</config-property>
<config-property>
<config-property-name>IntegerAO</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value>33</config-property-value>
</config-property>
<config-property>
<config-property-name>LongAO</config-property-name>
<config-property-type>java.lang.Long</config-property-type>
<config-property-value>34</config-property-value>
</config-property>
<config-property>
<config-property-name>FloatAO</config-property-name>
<config-property-type>java.lang.Float</config-property-type>
<config-property-value>6e26</config-property-value>
</config-property>
<config-property>
<config-property-name>DoubleAO</config-property-name>
<config-property-type>java.lang.Double</config-property-type>
<config-property-value>8e28</config-property-value>
</config-property>
</adminobject>
</resourceadapter>
</connector>
|
|
From: Weston P. <wes...@jb...> - 2006-07-07 02:49:24
|
User: wprice
Date: 06/07/06 22:49:21
Added: src/resources/jcaprops/xmloverride/META-INF jboss-ra.xml
Log:
[JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality.
Added new unit test case and support files.
Revision Changes Path
1.1 date: 2006/07/07 02:49:21; author: wprice; state: Exp;jbosstest/src/resources/jcaprops/xmloverride/META-INF/jboss-ra.xml
Index: jboss-ra.xml
===================================================================
<jboss-ra>
<ra-config-property>
<ra-config-property-name>StringRAR</ra-config-property-name>
<ra-config-property-type>java.lang.String</ra-config-property-type>
<ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>BooleanRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Boolean</ra-config-property-type>
<ra-config-property-value>False</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>ByteRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Byte</ra-config-property-type>
<ra-config-property-value>1</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>CharacterRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Character</ra-config-property-type>
<ra-config-property-value>A</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>ShortRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Short</ra-config-property-type>
<ra-config-property-value>2</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>IntegerRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Integer</ra-config-property-type>
<ra-config-property-value>3</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>LongRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Long</ra-config-property-type>
<ra-config-property-value>4</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>FloatRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Float</ra-config-property-type>
<ra-config-property-value>5e6</ra-config-property-value>
</ra-config-property>
<ra-config-property>
<ra-config-property-name>DoubleRAR</ra-config-property-name>
<ra-config-property-type>java.lang.Double</ra-config-property-type>
<ra-config-property-value>7e8</ra-config-property-value>
</ra-config-property>
</jboss-ra>
|
|
From: Weston P. <wes...@jb...> - 2006-07-07 02:48:33
|
User: wprice Date: 06/07/06 22:48:32 Log: Directory /cvsroot/jboss/jbosstest/src/resources/jcaprops/xmloverride/META-INF added to the repository |
|
From: Weston P. <wes...@jb...> - 2006-07-07 02:48:33
|
User: wprice Date: 06/07/06 22:48:32 Log: Directory /cvsroot/jboss/jbosstest/src/resources/jcaprops/xmloverride added to the repository |
185 messages has been excluded from this view by a project administrator.
