[jboss-cvs] JBossAS SVN: r70154 - in trunk: ejb3 and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 27 02:05:17 EST 2008
Author: ALRubinger
Date: 2008-02-27 02:05:17 -0500 (Wed, 27 Feb 2008)
New Revision: 70154
Removed:
trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/ejb3/.classpath
trunk/ejb3/build.xml
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
trunk/ejb3/src/main/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java
Log:
Upgraded to HA Client 1.0.0.GA, resolved compilation conflicts in EJB3 Module (though breaking features, EJB3 module in trunk is dead)
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/build/build-distr.xml 2008-02-27 07:05:17 UTC (rev 70154)
@@ -166,7 +166,7 @@
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.impl.lib}" includes="*.jar"
+ <fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.interceptors.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
@@ -196,7 +196,7 @@
<include name="jboss-aop-jdk50-client.jar"/>
</fileset>
<fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
</copy>
</target>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/build/build-thirdparty.xml 2008-02-27 07:05:17 UTC (rev 70154)
@@ -91,11 +91,11 @@
<componentref name="jboss/integration" version="5.0.0.Beta4"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jboss-ejb3-cache" version="0.11.1"/>
- <componentref name="jboss/jboss-ejb3-ext-api" version="0.1.2.Beta1"/>
- <componentref name="jboss/jboss-ejb3-impl" version="0.1.2.Beta1"/>
+ <componentref name="jboss/jboss-ejb3-ext-api" version="0.3-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ejb3-ext-api-impl" version="0.3-SNAPSHOT"/>
<componentref name="jboss/jboss-ejb3-interceptors" version="0.12.0-SNAPSHOT"/>
<componentref name="jboss/jboss-ejb3-metadata" version="0.12.0-SNAPSHOT"/>
- <componentref name="jboss/jboss-ha-client" version="1.0.0.BETA1"/>
+ <componentref name="jboss/jboss-ha-client" version="1.0.0.GA"/>
<componentref name="jboss/jboss-ha-server-api" version="1.0.0.GA"/>
<componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
<componentref name="jboss/jboss-javaee" version="5.0.0-SNAPSHOT"/>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/.classpath 2008-02-27 07:05:17 UTC (rev 70154)
@@ -73,5 +73,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-metadata/lib/jboss-ejb3-metadata.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-metadata/lib/jboss-ejb3-metadata-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api-impl/lib/jboss-ejb3-ext-api-impl.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/build.xml 2008-02-27 07:05:17 UTC (rev 70154)
@@ -116,7 +116,7 @@
<path refid="jboss.integration.classpath"/>
<path refid="jboss.jboss.ejb3.cache.classpath"/>
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
- <path refid="jboss.jboss.ejb3.impl.classpath" />
+ <path refid="jboss.jboss.ejb3.ext.api.impl.classpath" />
<path refid="jboss.jboss.ejb3.interceptors.classpath" />
<path refid="jboss.jboss.ejb3.metadata.classpath" />
</path>
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -1576,14 +1576,14 @@
{
Class<? extends LoadBalancePolicy> policy = (Class<? extends LoadBalancePolicy>) di.getClassLoader()
.loadClass(config.getBeanLoadBalancePolicy());
- clusteredAnnotation.setLoadBalancePolicy(policy);
+ clusteredAnnotation.setLoadBalancePolicy(""); // This branch is dead, putting NPE in place for valid compile only
}
if (config.getHomeLoadBalancePolicy() != null)
{
Class<? extends LoadBalancePolicy> policy = (Class<? extends LoadBalancePolicy>) di.getClassLoader()
.loadClass(config.getHomeLoadBalancePolicy());
- clusteredAnnotation.setHomeLoadBalancePolicy(policy);
+ clusteredAnnotation.setHomeLoadBalancePolicy(""); // This branch is dead, putting NPE in place for valid compile only
}
if (config.getPartitionName() != null)
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -71,9 +71,9 @@
impl.setPartition(ccmd.getPartitionName());
// FIXME Once @Clustered and ClusteredImpl are updated, just use the string values
if (ccmd.getBeanLoadBalancePolicy() != null)
- impl.setLoadBalancePolicy(loadClass(classLoader, ccmd.getBeanLoadBalancePolicy()));
+ impl.setLoadBalancePolicy("");// This branch is dead, putting invalid String in place for valid compile only
if (ccmd.getHomeLoadBalancePolicy() != null)
- impl.setHomeLoadBalancePolicy(loadClass(classLoader, ccmd.getHomeLoadBalancePolicy()));
+ impl.setHomeLoadBalancePolicy("");// This branch is dead, putting invalid String in place for valid compile only
}
return annotationClass.cast(impl);
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -36,7 +36,9 @@
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.defaults.ClusteredDefaults;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
+import org.jboss.ejb3.remoting.RemoteProxyFactoryRegistry;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.ha.client.loadbalance.FirstAvailable;
import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
@@ -108,7 +110,8 @@
}
else
{
- lbPolicy = clustered.loadBalancePolicy().newInstance();
+
+ lbPolicy = (LoadBalancePolicy)null; // This branch is dead, putting NPE in place for valid compile only
}
wrapper = new FamilyWrapper(proxyFamilyName, hatarget.getReplicants());
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -99,7 +99,7 @@
}
else
{
- lbPolicy = clustered.loadBalancePolicy().newInstance();
+ lbPolicy = (LoadBalancePolicy)null;// This branch is dead, putting NPE in place for valid compile only
}
wrapper = new FamilyWrapper(proxyFamilyName, hatarget.getReplicants());
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -13,7 +13,6 @@
import javax.ejb.Stateless;
import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ha.framework.interfaces.RoundRobin;
/**
* Simple stateless bean
@@ -21,7 +20,7 @@
* @author Ben Wang
*/
@Stateless(name="clusteredStateless")
- at Clustered(loadBalancePolicy = RoundRobin.class)
+ at Clustered(loadBalancePolicy = "RoundRobin")
@Remote(ClusteredStatelessRemote.class)
public class ClusteredStatelessSessionBean implements ClusteredStatelessRemote
{
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -34,7 +34,7 @@
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
@Stateful(name="OverrideStateful")
- at Clustered(partition="BogusPartition", loadBalancePolicy=org.jboss.ejb3.test.clusteredsession.BogusPolicy.class)
+ at Clustered(partition="BogusPartition", loadBalancePolicy="BogusPolicy")
@CacheConfig(maxSize=1000, idleTimeoutSeconds=2)
@Remote(OverrideStatefulRemote.class)
public class OverrideStatefulBean implements OverrideStatefulRemote
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java 2008-02-27 07:02:53 UTC (rev 70153)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java 2008-02-27 07:05:17 UTC (rev 70154)
@@ -34,7 +34,7 @@
*/
@Stateless
@Remote(StatelessRemote.class)
- at Clustered(loadBalancePolicy = RandomRobin.class)
+ at Clustered(loadBalancePolicy = "RandomRobin")
public class StatelessBean implements StatelessRemote
{
private static final Logger log = Logger.getLogger(StatelessBean.class);
More information about the jboss-cvs-commits
mailing list