[jboss-cvs] JBossAS SVN: r105943 - in trunk: cluster/src/main/java/org/jboss/ha/framework/server and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 10 16:44:31 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-06-10 16:44:29 -0400 (Thu, 10 Jun 2010)
New Revision: 105943
Modified:
trunk/aspects/src/main/java/org/jboss/aspects/remoting/ClusteredRemoting.java
trunk/cluster/src/main/java/org/jboss/ha/framework/server/HARMIServerImpl.java
trunk/cluster/src/main/java/org/jboss/invocation/http/server/HAInvokerWrapper.java
trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpInvokerHA.java
trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
trunk/cluster/src/main/java/org/jboss/invocation/unified/server/UnifiedInvokerHA.java
trunk/cluster/src/main/java/org/jboss/proxy/ejb/ProxyFactoryHA.java
trunk/cluster/src/main/java/org/jboss/proxy/generic/ProxyFactoryHA.java
trunk/component-matrix/pom.xml
Log:
[JBAS-7991] Update to ha-server-api 2.0.0.Alpha5
Modified: trunk/aspects/src/main/java/org/jboss/aspects/remoting/ClusteredRemoting.java
===================================================================
--- trunk/aspects/src/main/java/org/jboss/aspects/remoting/ClusteredRemoting.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/aspects/src/main/java/org/jboss/aspects/remoting/ClusteredRemoting.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -83,7 +83,7 @@
if (target == null)
{
target = new HATarget(partition, proxyFamilyName, locator, HATarget.ENABLE_INVOCATIONS);
- ClusteringTargetsRepository.initTarget(proxyFamilyName, target.getReplicants());
+ ClusteringTargetsRepository.initTarget(proxyFamilyName, target.getReplicantList());
families.put(proxyFamilyName, target);
}
}
@@ -91,7 +91,7 @@
{
families = new HashMap();
target = new HATarget(partition, proxyFamilyName, locator, HATarget.ENABLE_INVOCATIONS);
- ClusteringTargetsRepository.initTarget(proxyFamilyName, target.getReplicants());
+ ClusteringTargetsRepository.initTarget(proxyFamilyName, target.getReplicantList());
families.put(proxyFamilyName, target);
advisor.insertInterceptor(0, new ReplicantsManagerInterceptor(families));
}
@@ -107,7 +107,7 @@
proxyAdvisor.getMetaData().addMetaData(CLUSTERED_REMOTING,
CLUSTER_FAMILY_WRAPPER,
- new FamilyWrapper(proxyFamilyName, target.getReplicants()),
+ new FamilyWrapper(proxyFamilyName, target.getReplicantList()),
PayloadKey.AS_IS);
// LB policy should be AS_IS so that remoting framework downloads the classes
Modified: trunk/cluster/src/main/java/org/jboss/ha/framework/server/HARMIServerImpl.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/ha/framework/server/HARMIServerImpl.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/ha/framework/server/HARMIServerImpl.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -167,7 +167,7 @@
*/
public Object createHAStub(LoadBalancePolicy policy)
{
- HARMIClient client = new HARMIClient(target.getReplicants(),
+ HARMIClient client = new HARMIClient(target.getReplicantList(),
target.getCurrentViewId (), policy, key, handler);
this.target.addProxy (client);
return Proxy.newProxyInstance(
@@ -203,7 +203,7 @@
HARMIResponse rsp = new HARMIResponse();
if (clientViewId != target.getCurrentViewId())
{
- rsp.newReplicants = new ArrayList<Object>(target.getReplicants());
+ rsp.newReplicants = new ArrayList<Object>(target.getReplicantList());
rsp.currentViewId = target.getCurrentViewId();
}
@@ -226,7 +226,7 @@
public List<?> getReplicants() throws Exception
{
- return target.getReplicants();
+ return target.getReplicantList();
}
public Object getLocal() throws Exception
Modified: trunk/cluster/src/main/java/org/jboss/invocation/http/server/HAInvokerWrapper.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/invocation/http/server/HAInvokerWrapper.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/invocation/http/server/HAInvokerWrapper.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -137,7 +137,7 @@
HARMIResponse rsp = new HARMIResponse();
if (clientViewId.longValue() != target.getCurrentViewId())
{
- rsp.newReplicants = new ArrayList(target.getReplicants());
+ rsp.newReplicants = new ArrayList<Object>(target.getReplicantList());
rsp.currentViewId = target.getCurrentViewId();
}
rsp.response = rtn;
Modified: trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpInvokerHA.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpInvokerHA.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpInvokerHA.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -108,7 +108,7 @@
throw new IllegalStateException("The targetName("+targetName
+ "), hashCode("+hash+") not found");
}
- Invoker proxy = new HttpInvokerProxyHA(target.getReplicants(), target.getCurrentViewId (),
+ Invoker proxy = new HttpInvokerProxyHA(target.getReplicantList(), target.getCurrentViewId (),
policy, proxyFamilyName);
return proxy;
}
@@ -160,7 +160,7 @@
HARMIResponse rsp = new HARMIResponse();
if (clientViewId != target.getCurrentViewId())
{
- rsp.newReplicants = new ArrayList<Object>(target.getReplicants());
+ rsp.newReplicants = new ArrayList<Object>(target.getReplicantList());
rsp.currentViewId = target.getCurrentViewId();
}
rsp.response = rtn;
Modified: trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -155,7 +155,7 @@
// Finally, create the invoker proxy, a HttpInvokerProxyHA
String clusterFamilyName = partitionName + "/" + wrappedJmxInvokerName.toString();
- Invoker delegateInvoker = new HttpInvokerProxyHA(invokerTarget.getReplicants(), invokerTarget.getCurrentViewId (),
+ Invoker delegateInvoker = new HttpInvokerProxyHA(invokerTarget.getReplicantList(), invokerTarget.getCurrentViewId (),
policy, clusterFamilyName);
return delegateInvoker;
}
Modified: trunk/cluster/src/main/java/org/jboss/invocation/unified/server/UnifiedInvokerHA.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/invocation/unified/server/UnifiedInvokerHA.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/invocation/unified/server/UnifiedInvokerHA.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -98,7 +98,7 @@
}
return createProxy(getStrictRMIException(),
- target.getReplicants(), policy, proxyFamilyName, target.getCurrentViewId());
+ target.getReplicantList(), policy, proxyFamilyName, target.getCurrentViewId());
}
public void unregisterBean(ObjectName beanName) throws Exception
@@ -161,7 +161,7 @@
if(clientViewId != target.getCurrentViewId())
{
- haResponse.newReplicants = new ArrayList<Object>(target.getReplicants());
+ haResponse.newReplicants = new ArrayList<Object>(target.getReplicantList());
haResponse.currentViewId = target.getCurrentViewId();
}
haResponse.response = obj;
Modified: trunk/cluster/src/main/java/org/jboss/proxy/ejb/ProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/proxy/ejb/ProxyFactoryHA.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/proxy/ejb/ProxyFactoryHA.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -258,11 +258,11 @@
{
if (homeInvoker instanceof InvokerProxyHA)
{
- ((InvokerProxyHA)homeInvoker).updateClusterInfo (target.getReplicants(), target.getCurrentViewId ());
+ ((InvokerProxyHA)homeInvoker).updateClusterInfo (target.getReplicantList(), target.getCurrentViewId ());
}
if (beanInvoker instanceof InvokerProxyHA)
{
- ((InvokerProxyHA)beanInvoker).updateClusterInfo (target.getReplicants(), target.getCurrentViewId ());
+ ((InvokerProxyHA)beanInvoker).updateClusterInfo (target.getReplicantList(), target.getCurrentViewId ());
}
log.debug ("Rebinding in JNDI... " + key);
Modified: trunk/cluster/src/main/java/org/jboss/proxy/generic/ProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/proxy/generic/ProxyFactoryHA.java 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/cluster/src/main/java/org/jboss/proxy/generic/ProxyFactoryHA.java 2010-06-10 20:44:29 UTC (rev 105943)
@@ -117,7 +117,7 @@
drm.registerListener (replicantName, this);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Class clazz;
+ Class<?> clazz;
LoadBalancePolicy policy;
clazz = cl.loadClass(loadBalancePolicy);
@@ -171,14 +171,14 @@
// synchronized keyword added when it became possible for DRM to issue
// concurrent replicantsChanged notifications. JBAS-2169.
public synchronized void replicantsChanged(String key,
- List newReplicants,
+ List<?> newReplicants,
int newReplicantsViewId,
boolean merge)
{
try
{
if (invoker instanceof InvokerProxyHA)
- ((InvokerProxyHA) invoker).updateClusterInfo(target.getReplicants(), target.getCurrentViewId());
+ ((InvokerProxyHA) invoker).updateClusterInfo(target.getReplicantList(), target.getCurrentViewId());
log.debug ("Rebinding in JNDI... " + key);
rebind();
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-06-10 20:28:49 UTC (rev 105942)
+++ trunk/component-matrix/pom.xml 2010-06-10 20:44:29 UTC (rev 105943)
@@ -100,7 +100,7 @@
<version.org.jboss.cluster.cache.jbc>2.4.0.Alpha2</version.org.jboss.cluster.cache.jbc>
<version.org.jboss.cluster.cache.spi>2.2.0.Final</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
- <version.org.jboss.cluster.server.api>2.0.0.Alpha4</version.org.jboss.cluster.server.api>
+ <version.org.jboss.cluster.server.api>2.0.0.Alpha5</version.org.jboss.cluster.server.api>
<version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha5</version.org.jboss.deployers>
More information about the jboss-cvs-commits
mailing list