[jboss-cvs] JBossAS SVN: r68613 - in projects/ejb3/trunk: core and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 3 18:29:26 EST 2008
Author: bdecoste
Date: 2008-01-03 18:29:26 -0500 (Thu, 03 Jan 2008)
New Revision: 68613
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java
Log:
mavenized projects/ejb/core. Replace jboss-ejb3.jar with jboss-ejb3-core.jar in the AS
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/build/pom.xml 2008-01-03 23:29:26 UTC (rev 68613)
@@ -125,14 +125,15 @@
-->
<version.apache.commons.digester>1.8</version.apache.commons.digester>
<version.apache.commons.validator>1.3.1</version.apache.commons.validator>
- <version.ant.junit>1.7.0</version.ant.junit>
- <version.gnu.trove>2.1.1</version.gnu.trove>
+ <version.ant.junit>3.8.1</version.ant.junit>
+ <version.gnu.trove>1.0.2</version.gnu.trove>
<version.jboss.aop>2.0.0.beta1</version.jboss.aop>
<version.jboss.common.core>2.2.1.GA</version.jboss.common.core>
<version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
<version.jboss.ejb.api>3.0.0.20070913080910</version.jboss.ejb.api>
<version.jboss.logging.log4j>2.0.2.GA</version.jboss.logging.log4j>
<version.jboss.logging.spi>2.0.2.GA</version.jboss.logging.spi>
+ <version.jboss.remoting></version.jboss.remoting>
<version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
<version.junit>4.4</version.junit>
@@ -312,7 +313,6 @@
<groupId>trove</groupId>
<artifactId>trove</artifactId>
<version>${version.gnu.trove}</version>
- <scope>runtime</scope>
</dependency>
<!-- JavaEE EJB3 API -->
@@ -355,11 +355,11 @@
<version>${version.jboss.logging.spi}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
<version>${version.jboss.remoting}</version>
- </dependency>
+ </dependency-->
<!-- JBoss Serialization -->
<dependency>
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/core/pom.xml 2008-01-03 23:29:26 UTC (rev 68613)
@@ -63,6 +63,9 @@
<version.quartz>1.6.0</version.quartz>
<version.jboss.jca.api>1.5.0.Beta3Update1</version.jboss.jca.api>
<version.jboss.as.connector>5.0.0-20071211.184358-1</version.jboss.as.connector>
+ <version.trove>1.0.2</version.trove>
+ <version.junit>3.8.1</version.junit>
+ <version.ant>1.6.5</version.ant>
</properties>
<!-- Build Information -->
@@ -249,6 +252,27 @@
<artifactId>jboss-as-connector</artifactId>
<version>${version.jboss.as.connector}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.jboss.test}</version>
+ </dependency>
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>${version.trove}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2008-01-03 23:29:26 UTC (rev 68613)
@@ -109,7 +109,7 @@
}
else
{
- lbPolicy = clustered.loadBalancePolicy().newInstance();
+ lbPolicy = (LoadBalancePolicy)getContainer().getBeanClass().getClassLoader().loadClass(clustered.loadBalancePolicy()).newInstance();
}
wrapper = new FamilyWrapper(proxyFamilyName, hatarget.getReplicants());
Modified: projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/core/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2008-01-03 23:29:26 UTC (rev 68613)
@@ -100,7 +100,7 @@
}
else
{
- lbPolicy = clustered.loadBalancePolicy().newInstance();
+ lbPolicy = (LoadBalancePolicy)getContainer().getBeanClass().getClassLoader().loadClass(clustered.loadBalancePolicy()).newInstance();
}
wrapper = new FamilyWrapper(proxyFamilyName, hatarget.getReplicants());
Modified: projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2008-01-03 23:29:26 UTC (rev 68613)
@@ -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 = "org.jboss.ha.framework.interfaces.RoundRobin")
@Remote(ClusteredStatelessRemote.class)
public class ClusteredStatelessSessionBean implements ClusteredStatelessRemote
{
Modified: projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2008-01-03 23:29:26 UTC (rev 68613)
@@ -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= "org.jboss.ejb3.test.clusteredsession.BogusPolicy")
@CacheConfig(maxSize=1000, idleTimeoutSeconds=2)
@Remote(OverrideStatefulRemote.class)
public class OverrideStatefulBean implements OverrideStatefulRemote
Modified: projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java 2008-01-03 21:54:34 UTC (rev 68612)
+++ projects/ejb3/trunk/core/src/test/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java 2008-01-03 23:29:26 UTC (rev 68613)
@@ -25,8 +25,6 @@
import javax.ejb.Remote;
import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ha.framework.interfaces.RandomRobin;
-import org.jboss.ha.framework.interfaces.RoundRobin;
import org.jboss.logging.Logger;
/**
@@ -34,7 +32,7 @@
*/
@Stateless
@Remote(StatelessRemote.class)
- at Clustered(loadBalancePolicy = RandomRobin.class)
+ at Clustered(loadBalancePolicy = "org.jboss.ha.framework.interfaces.RandomRobin")
public class StatelessBean implements StatelessRemote
{
private static final Logger log = Logger.getLogger(StatelessBean.class);
More information about the jboss-cvs-commits
mailing list