[jboss-cvs] JBossAS SVN: r83929 - in projects/ejb3/trunk: api and 53 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 6 02:07:08 EST 2009
Author: wolfc
Date: 2009-02-06 02:07:07 -0500 (Fri, 06 Feb 2009)
New Revision: 83929
Modified:
projects/ejb3/trunk/api/pom.xml
projects/ejb3/trunk/api/src/main/java/javax/ejb/AccessTimeout.java
projects/ejb3/trunk/api/src/main/java/javax/ejb/ConcurrencyManagementType.java
projects/ejb3/trunk/api/src/main/java/javax/ejb/EJBContainer.java
projects/ejb3/trunk/api/src/main/java/javax/ejb/TimerService.java
projects/ejb3/trunk/async/.classpath
projects/ejb3/trunk/async/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/trunk/attachments/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/cache/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/common/.project
projects/ejb3/trunk/embedded/.classpath
projects/ejb3/trunk/embedded/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/trunk/embedded/pom.xml
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java
projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java
projects/ejb3/trunk/ext-api-impl/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/ext-api/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/injection/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/interceptors/.classpath
projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java
projects/ejb3/trunk/locator/.classpath
projects/ejb3/trunk/locator/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/Ejb3ServiceLocator.java
projects/ejb3/trunk/pom.xml
projects/ejb3/trunk/pool/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/sandbox/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/security/.classpath
projects/ejb3/trunk/test/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/testsuite/.classpath
projects/ejb3/trunk/testsuite/.project
projects/ejb3/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/trunk/testsuite/build-test.xml
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/unit/ChangeXMLUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1624/AccessBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptormetadata/MockDependencyPolicy.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/ServiceFive.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/resources/known-issues.xml
projects/ejb3/trunk/testsuite/src/test/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
projects/ejb3/trunk/testsuite/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-jboss-beans.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss2.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/service/META-INF/jboss.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/tck5sec/META-INF/jboss.xml
projects/ejb3/trunk/timerservice-as5/pom.xml
projects/ejb3/trunk/timerservice-spi/pom.xml
projects/ejb3/trunk/transactions/.classpath
projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/trunk/transactions/src/test/resources/log4j.xml
Log:
oops, rollback 83928
Modified: projects/ejb3/trunk/api/pom.xml
===================================================================
--- projects/ejb3/trunk/api/pom.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/api/pom.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -31,70 +31,9 @@
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.0.1.GA</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
<version>1.0.1.CR2</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/jboss/ejb3/api/test/signature/unit/SignatureUnitTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>signaturetest</id>
- <activation>
- <property>
- <name>env.javax_ejb_jar_path</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/jboss/ejb3/api/test/signature/unit/SignatureUnitTestCase.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>javax.ejb.jar.path</name>
- <value>${env.javax_ejb_jar_path}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/AccessTimeout.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/AccessTimeout.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/AccessTimeout.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -27,10 +27,9 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import java.util.concurrent.TimeUnit;
/**
- * Specifies the amount of time in a given time unit that a concurrent access
+ * Specifies the amount of time(in milliseconds) that a concurrent access
* attempt on a Singleton session bean should block before timing out.
*
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -41,9 +40,7 @@
@Retention(RUNTIME)
public @interface AccessTimeout {
/**
- * The maximum time to wait for access.
+ * Timeout in milliseconds.
*/
- long value();
-
- TimeUnit unit() default TimeUnit.MILLISECONDS;
+ int value();
}
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/ConcurrencyManagementType.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/ConcurrencyManagementType.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/ConcurrencyManagementType.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -24,9 +24,8 @@
/**
* A Singleton bean's concurrency management type.
* <ul>
- * <li>BEAN : Bean managed concurrency</li>
- * <li>CONCURRENCY_NOT_ALLOWED : Concurrency not allowed</li>
* <li>CONTAINER : Container managed concurrency</li>
+ * <li>BEAN : Bean managed concurrency</li>
* </ul>
*
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -35,6 +34,5 @@
*/
public enum ConcurrencyManagementType {
BEAN,
- CONCURRENCY_NOT_ALLOWED,
CONTAINER
}
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/EJBContainer.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/EJBContainer.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -49,10 +49,7 @@
*/
public abstract class EJBContainer
{
- public static final String EMBEDDABLE_APP_NAME_PROPERTY = "javax.ejb.embeddable.appName";
- public static final String EMBEDDABLE_INITIAL_PROPERTY = "javax.ejb.embeddable.initial";
- @Deprecated
- public static final String EMBEDDABLE_INITIAL = EMBEDDABLE_INITIAL_PROPERTY;
+ public static final String EMBEDDABLE_INITIAL = "javax.ejb.embeddable.initial";
public static final String EMBEDDABLE_MODULES_PROPERTY = "javax.ejb.embeddable.modules";
private static EJBContainerWrapper currentEJBContainer;
@@ -175,7 +172,6 @@
* @return EJBContainer instance, or null if none exists or if the last EJBContainer
* instance has been closed.
*/
- @Deprecated
public static EJBContainer getCurrentEJBContainer()
{
if(currentEJBContainer != null && currentEJBContainer.isClosed())
Modified: projects/ejb3/trunk/api/src/main/java/javax/ejb/TimerService.java
===================================================================
--- projects/ejb3/trunk/api/src/main/java/javax/ejb/TimerService.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/api/src/main/java/javax/ejb/TimerService.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -32,62 +32,42 @@
* a specified time, after a specified elapsed time, or after a specified interval.
**/
public interface TimerService {
+
/**
- * Create a calendar-based timer based on the input schedule expression.
- *
- * @param schedule A schedule expression describing the timeouts for this timer.
- * @param info Application information to be delivered along with the timer
- * expiration. This can be null.
- * @return The newly created Timer.
- * @throws IllegalArgumentException If Schedule represents an invalid schedule
- * expression.
- * @throws IllegalStateException If this method is invoked while the instance
- * is in a state that does not allow access to this method.
+ * Create a single-action timer that expires after a specified duration.
+ *
+ * @param duration The number of milliseconds that must elapse before the timer expires.
+ * @param info Application information to be delivered along with the timer expiration
+ * notification. This can be null.
+ *
+ * @return The newly created Timer.
+ *
+ * @throws IllegalArgumentException If duration is negative
+ * @throws IllegalStateException If this method is invoked while the instance is in
+ * a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
- * @since 3.1
- */
- Timer createCalendarTimer(ScheduleExpression schedule, Serializable info)
- throws IllegalArgumentException, IllegalStateException, EJBException;
-
+ **/
+ public Timer createTimer( long duration, Serializable info )
+ throws
+ IllegalArgumentException,
+ IllegalStateException,
+ EJBException;
+
/**
- * Create a calendar-based timer based on the input schedule expression.
- *
- * @param schedule A schedule expression describing the timeouts for this timer.
- * @param timerConfig Timer configuration.
- * @return The newly created Timer.
- * @throws IllegalArgumentException If Schedule represents an invalid schedule
- * expression.
- * @throws IllegalStateException If this method is invoked while the instance
- * is in a state that does not allow access to this method.
- * @throws EJBException If this method could not complete due to a system-level failure.
- * @since 3.1
- */
- Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig)
- throws IllegalArgumentException, IllegalStateException, EJBException;
-
- /**
- * Create an interval timer whose first expiration occurs at a given point in time and
- * whose subsequent expirations occur after a specified interval.
+ * Create a single-action timer that expires after a specified duration.
*
- * @param initialExpiration The point in time at which the first timer expiration must occur.
- * @param intervalDuration The number of milliseconds that must elapse between timer
- * expiration notifications. Expiration notifications are
- * scheduled relative to the time of the first expiration. If
- * expiration is delayed(e.g. due to the interleaving of other
- * method calls on the bean) two or more expiration notifications
- * may occur in close succession to "catch up".
+ * @param duration The number of milliseconds that must elapse before the timer expires.
* @param timerConfig Timer configuration.
*
* @return The newly created Timer.
*
- * @throws IllegalArgumentException If initialExpiration is null, or initialExpiration.getTime()
- * is negative, or intervalDuration is negative.
+ * @throws IllegalArgumentException If duration is negative
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
* @since 3.1
**/
- public Timer createIntervalTimer( Date initialExpiration, long intervalDuration, TimerConfig timerConfig )
+ public Timer createTimer( long duration, TimerConfig timerConfig )
throws
IllegalArgumentException,
IllegalStateException,
@@ -105,7 +85,8 @@
* expiration is delayed(e.g. due to the interleaving of other
* method calls on the bean) two or more expiration notifications
* may occur in close succession to "catch up".
- * @param timerConfig Timer configuration.
+ * @param info Application information to be delivered along with the timer expiration
+ * notification. This can be null.
*
* @return The newly created Timer.
*
@@ -114,80 +95,87 @@
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
- * @since 3.1
**/
- public Timer createIntervalTimer( long initialDuration, long intervalDuration, TimerConfig timerConfig )
+ public Timer createTimer( long initialDuration, long intervalDuration, Serializable info )
throws
IllegalArgumentException,
IllegalStateException,
EJBException;
/**
- * Create a single-action timer that expires at a given point in time.
+ * Create an interval timer whose first expiration occurs after a specified duration,
+ * and whose subsequent expirations occur after a specified interval.
*
- * @param expiration The point in time at which the timer must expire.
+ * @param initialDuration The number of milliseconds that must elapse before the first
+ * timer expiration notification.
+ * @param intervalDuration The number of milliseconds that must elapse between timer
+ * expiration notifications. Expiration notifications are
+ * scheduled relative to the time of the first expiration. If
+ * expiration is delayed(e.g. due to the interleaving of other
+ * method calls on the bean) two or more expiration notifications
+ * may occur in close succession to "catch up".
* @param timerConfig Timer configuration.
*
* @return The newly created Timer.
*
- * @throws IllegalArgumentException If expiration is null, or expiration.getTime() is negative.
+ * @throws IllegalArgumentException If initialDuration is negative, or intervalDuration
+ * is negative.
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
* @since 3.1
**/
- public Timer createSingleActionTimer( Date expiration, TimerConfig timerConfig )
+ public Timer createTimer( long initialDuration, long intervalDuration, TimerConfig timerConfig )
throws
IllegalArgumentException,
IllegalStateException,
EJBException;
/**
- * Create a single-action timer that expires after a specified duration.
+ * Create a single-action timer that expires at a given point in time.
*
- * @param duration The number of milliseconds that must elapse before the timer expires.
- * @param timerConfig Timer configuration.
+ * @param expiration The point in time at which the timer must expire.
+ * @param info Application information to be delivered along with the timer expiration
+ * notification. This can be null.
*
* @return The newly created Timer.
*
- * @throws IllegalArgumentException If duration is negative
+ * @throws IllegalArgumentException If expiration is null, or expiration.getTime() is negative.
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
- * @since 3.1
**/
- public Timer createSingleActionTimer( long duration, TimerConfig timerConfig )
+ public Timer createTimer( Date expiration, Serializable info )
throws
IllegalArgumentException,
IllegalStateException,
EJBException;
/**
- * Create a single-action timer that expires after a specified duration.
+ * Create a single-action timer that expires at a given point in time.
*
- * @param duration The number of milliseconds that must elapse before the timer expires.
- * @param info Application information to be delivered along with the timer expiration
- * notification. This can be null.
+ * @param expiration The point in time at which the timer must expire.
+ * @param timerConfig Timer configuration.
*
* @return The newly created Timer.
*
- * @throws IllegalArgumentException If duration is negative
+ * @throws IllegalArgumentException If expiration is null, or expiration.getTime() is negative.
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
**/
- public Timer createTimer( long duration, Serializable info )
+ public Timer createTimer( Date expiration, TimerConfig timerConfig )
throws
IllegalArgumentException,
IllegalStateException,
EJBException;
/**
- * Create an interval timer whose first expiration occurs after a specified duration,
- * and whose subsequent expirations occur after a specified interval.
+ * Create an interval timer whose first expiration occurs at a given point in time and
+ * whose subsequent expirations occur after a specified interval.
*
- * @param initialDuration The number of milliseconds that must elapse before the first
- * timer expiration notification.
+ * @param initialExpiration The point in time at which the first timer expiration must occur.
* @param intervalDuration The number of milliseconds that must elapse between timer
* expiration notifications. Expiration notifications are
* scheduled relative to the time of the first expiration. If
@@ -199,39 +187,19 @@
*
* @return The newly created Timer.
*
- * @throws IllegalArgumentException If initialDuration is negative, or intervalDuration
- * is negative.
+ * @throws IllegalArgumentException If initialExpiration is null, or initialExpiration.getTime()
+ * is negative, or intervalDuration is negative.
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
**/
- public Timer createTimer( long initialDuration, long intervalDuration, Serializable info )
+ public Timer createTimer( Date initialExpiration, long intervalDuration, Serializable info )
throws
IllegalArgumentException,
IllegalStateException,
EJBException;
/**
- * Create a single-action timer that expires at a given point in time.
- *
- * @param expiration The point in time at which the timer must expire.
- * @param info Application information to be delivered along with the timer expiration
- * notification. This can be null.
- *
- * @return The newly created Timer.
- *
- * @throws IllegalArgumentException If expiration is null, or expiration.getTime() is negative.
- * @throws IllegalStateException If this method is invoked while the instance is in
- * a state that does not allow access to this method.
- * @throws EJBException If this method could not complete due to a system-level failure.
- **/
- public Timer createTimer( Date expiration, Serializable info )
- throws
- IllegalArgumentException,
- IllegalStateException,
- EJBException;
-
- /**
* Create an interval timer whose first expiration occurs at a given point in time and
* whose subsequent expirations occur after a specified interval.
*
@@ -242,8 +210,7 @@
* expiration is delayed(e.g. due to the interleaving of other
* method calls on the bean) two or more expiration notifications
* may occur in close succession to "catch up".
- * @param info Application information to be delivered along with the timer expiration
- * notification. This can be null.
+ * @param timerConfig Timer configuration.
*
* @return The newly created Timer.
*
@@ -252,14 +219,48 @@
* @throws IllegalStateException If this method is invoked while the instance is in
* a state that does not allow access to this method.
* @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
**/
- public Timer createTimer( Date initialExpiration, long intervalDuration, Serializable info )
+ public Timer createTimer( Date initialExpiration, long intervalDuration, TimerConfig timerConfig )
throws
IllegalArgumentException,
IllegalStateException,
EJBException;
/**
+ * Create a calendar-based timer based on the input schedule expression.
+ *
+ * @param schedule A schedule expression describing the timeouts for this timer.
+ * @param info Application information to be delivered along with the timer
+ * expiration. This can be null.
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If Schedule represents an invalid schedule
+ * expression.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+ Timer createTimer(ScheduleExpression schedule, Serializable info)
+ throws IllegalArgumentException, IllegalStateException, EJBException;
+
+ /**
+ * Create a calendar-based timer based on the input schedule expression.
+ *
+ * @param schedule A schedule expression describing the timeouts for this timer.
+ * @param timerConfig Timer configuration.
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If Schedule represents an invalid schedule
+ * expression.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+ Timer createTimer(ScheduleExpression schedule, TimerConfig timerConfig)
+ throws IllegalArgumentException, IllegalStateException, EJBException;
+
+ /**
* Get all the active timers associated with this bean.
*
* @return A collection of javax.ejb.Timer objects.
Modified: projects/ejb3/trunk/async/.classpath
===================================================================
--- projects/ejb3/trunk/async/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/async/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,42 +5,5 @@
<classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/security/jacc/1.0/jacc-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.0.0.SP1/jboss-aop-aspects-2.0.0.SP1.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.0.0.SP1/jboss-aop-aspects-2.0.0.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.1.CR2/jboss-remoting-aspects-1.0.1.CR2.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.1.CR2/jboss-remoting-aspects-1.0.1.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0.Beta1/jboss-security-aspects-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0.Beta1/jboss-security-aspects-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.Beta5/jboss-security-spi-2.0.2.Beta5.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.Beta5/jboss-security-spi-2.0.2.Beta5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.2.Beta5/jbosssx-client-2.0.2.Beta5.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.2.Beta5/jbosssx-client-2.0.2.Beta5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/1.0.2/trove-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/async/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/trunk/async/.settings/org.maven.ide.eclipse.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/async/.settings/org.maven.ide.eclipse.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,8 +1,9 @@
-#Wed Sep 17 09:57:06 CEST 2008
-activeProfiles=eclipse
+#Fri Oct 24 01:09:07 GMT-05:00 2008
+activeProfiles=
eclipse.preferences.version=1
-fullBuildGoals=
+filterResources=false
includeModules=false
resolveWorkspaceProjects=true
-resourceFilterGoals=
+resourceFilterGoals=process-resources resources\:testResources
+useMavenFolders=false
version=1
Modified: projects/ejb3/trunk/attachments/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/attachments/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/attachments/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 18:57:14 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/cache/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/cache/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/cache/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 19:01:57 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/common/.project
===================================================================
--- projects/ejb3/trunk/common/.project 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/common/.project 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,23 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-ejb3-common</name>
- <comment>JBoss EJB 3.0 Utilities Common to all Components</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+ <name>jboss-ejb3-common</name>
+ <comment>JBoss EJB 3.0 Utilities Common to all Components</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: projects/ejb3/trunk/embedded/.classpath
===================================================================
--- projects/ejb3/trunk/embedded/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,143 +5,5 @@
<classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" sourcepath="M2_REPO/apache-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/security/jacc/1.0/jacc-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.0.0.CR7/jboss-aop-aspects-2.0.0.CR7.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.0.0.CR7/jboss-aop-aspects-2.0.0.CR7-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-deployer-jdk50/2.0.0.CR17/jboss-aop-deployer-jdk50-2.0.0.CR17.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-jdk50/2.0.0.CR17/jboss-aop-jdk50-2.0.0.CR17.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.CR2/jboss-aop-mc-int-2.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.CR2/jboss-aop-mc-int-2.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR2/jboss-as-bootstrap-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR2/jboss-as-bootstrap-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.0.0.CR2/jboss-as-deployment-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.0.0.CR2/jboss-as-deployment-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR2/jboss-as-j2se-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR2/jboss-as-j2se-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR2/jboss-as-j2se-5.0.0.CR2-tests.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR2/jboss-as-jmx-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR2/jboss-as-jmx-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR2/jboss-as-main-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR2/jboss-as-main-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR2/jboss-as-mbeans-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR2/jboss-as-mbeans-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-security/5.0.0.CR2/jboss-as-security-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-security/5.0.0.CR2/jboss-as-security-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR2/jboss-as-system-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR2/jboss-as-system-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR2/jboss-as-system-jmx-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR2/jboss-as-system-jmx-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.CR5/jboss-classloader-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.CR5/jboss-classloader-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.CR5/jboss-classloading-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.CR5/jboss-classloading-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.CR5/jboss-classloading-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.CR5/jboss-classloading-vfs-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.GA/jboss-dependency-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.GA/jboss-dependency-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.CR5/jboss-deployers-client-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.CR5/jboss-deployers-client-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.CR5/jboss-deployers-core-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.CR5/jboss-deployers-core-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.CR5/jboss-deployers-impl-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.CR5/jboss-deployers-impl-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.CR5/jboss-deployers-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.CR5/jboss-deployers-vfs-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.CR5/jboss-deployers-vfs-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.CR5/jboss-deployers-vfs-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.0.0.CR2/jboss-deployment-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.0.0.CR2/jboss-deployment-spi-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-api/3.1.0-Alpha1/jboss-ejb3-api-3.1.0-Alpha1.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-api/3.1.0-Alpha1/jboss-ejb3-api-3.1.0-Alpha1-sources.jar">
- <attributes>
- <attribute value="jar:file:/home/carlo/.m2/repository/org/jboss/ejb3/jboss-ejb3-api/3.1.0-Alpha1/jboss-ejb3-api-3.1.0-Alpha1-javadoc.jar!/" name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-async/1.0.0/jboss-ejb3-async-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-async/1.0.0/jboss-ejb3-async-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-core/1.0.0/jboss-ejb3-core-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-core/1.0.0/jboss-ejb3-core-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-deployers/0.1.1/jboss-ejb3-deployers-0.1.1.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-deployers/0.1.1/jboss-ejb3-deployers-0.1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy/1.0.0/jboss-ejb3-proxy-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy/1.0.0/jboss-ejb3-proxy-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.0/jboss-ejb3-proxy-clustered-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.0/jboss-ejb3-proxy-clustered-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-transactions/1.0.0/jboss-ejb3-transactions-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-transactions/1.0.0/jboss-ejb3-transactions-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-client/1.1.0.CR4/jboss-ha-client-1.1.0.CR4.jar" sourcepath="M2_REPO/org/jboss/cluster/jboss-ha-client/1.1.0.CR4/jboss-ha-client-1.1.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-api/1.1.0.CR4/jboss-ha-server-api-1.1.0.CR4.jar" sourcepath="M2_REPO/org/jboss/cluster/jboss-ha-server-api/1.1.0.CR4/jboss-ha-server-api-1.1.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.CR2/jboss-jad-api-1.2.0.CR2.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.CR2/jboss-jad-api-1.2.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR1/jboss-jca-api-1.5.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR1/jboss-jca-api-1.5.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-jca-spi/5.0.3.GA/jboss-jca-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-jca-spi/5.0.3.GA/jboss-jca-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0-Beta5/jboss-jpa-deployers-1.0.0-Beta5.jar" sourcepath="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0-Beta5/jboss-jpa-deployers-1.0.0-Beta5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.GA/jboss-kernel-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.GA/jboss-kernel-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR1/jboss-metatype-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR1/jboss-metatype-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.GA/jboss-reflect-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.GA/jboss-reflect-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.0.GA/jboss-remoting-2.5.0.GA.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.0.GA/jboss-remoting-2.5.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.1.CR4/jboss-remoting-aspects-1.0.1.CR4.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.1.CR4/jboss-remoting-aspects-1.0.1.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0.Beta1/jboss-security-aspects-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0.Beta1/jboss-security-aspects-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP2/jboss-security-spi-2.0.2.SP2.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP2/jboss-security-spi-2.0.2.SP2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR2/jboss-transaction-api-1.0.1.CR2.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR2/jboss-transaction-api-1.0.1.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR3/jboss-vfs-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR3/jboss-vfs-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.0.0.CR4/jbosscache-core-3.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/cache/jbosscache-core/3.0.0.CR4/jbosscache-core-3.0.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossjta/4.4.0.CR2/jbossjta-4.4.0.CR2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP2/jbosssx-2.0.2.SP2.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP2/jbosssx-2.0.2.SP2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.2.CR6/jbosssx-client-2.0.2.CR6.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.2.CR6/jbosssx-client-2.0.2.CR6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossts-common/4.4.0.CR1/jbossts-common-4.4.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.0.3.GA/jbossws-native-jaxws-3.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.0.3.GA/jbossws-native-jaxws-3.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.5.GA/jgroups-2.6.5.GA.jar" sourcepath="M2_REPO/jgroups/jgroups/2.6.5.GA/jgroups-2.6.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jpl-util/jpl-util/1.0/jpl-util-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxws/jsr181-api/2.1.1/jsr181-api-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.6.0/quartz-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/1.0.2/trove-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/embedded/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/trunk/embedded/.settings/org.maven.ide.eclipse.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/.settings/org.maven.ide.eclipse.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,10 +1,10 @@
-#Mon Dec 08 11:58:15 CET 2008
-activeProfiles=eclipse
+#Fri Oct 31 03:25:00 GMT-05:00 2008
+activeProfiles=
eclipse.preferences.version=1
filterResources=false
fullBuildGoals=
includeModules=false
-resolveWorkspaceProjects=false
-resourceFilterGoals=
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
useMavenFolders=false
version=1
Modified: projects/ejb3/trunk/embedded/pom.xml
===================================================================
--- projects/ejb3/trunk/embedded/pom.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/pom.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.1</version>
+ <version>1.0.0-Beta9</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-Beta10</version>
<exclusions>
<!--
<exclusion>
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -56,7 +56,7 @@
// stage 1
private BasicBootstrap bootstrap = new BasicBootstrap();
- private static Kernel kernel;
+ private Kernel kernel;
private BasicXMLDeployer deployer;
// stage 2
@@ -207,11 +207,6 @@
return context;
}
- public static Kernel getKernel()
- {
- return kernel;
- }
-
private URL getResource(String name) throws IllegalArgumentException
{
URL url = classLoader.getResource(name);
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -37,7 +37,6 @@
import org.jboss.ejb3.javaee.JavaEEModule;
import org.jboss.ejb3.javaee.SimpleJavaEEModule;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.plugins.scope.InstanceScope;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -96,8 +95,6 @@
}
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(componentName, component.getClass().getName());
- // TODO: refactor the registrar
- //builder.addAnnotation("@" + InstanceScope.class.getName() + "(\"" + componentName + "\")");
builder.setConstructorValue(component);
addDependencies(builder, unit, component);
Modified: projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -4,8 +4,6 @@
<bean name="JavaEEModuleInformer" class="org.jboss.ejb3.embedded.javaee.SimpleJavaEEModuleInformer"/>
- <bean name="SpecCompliantSearchStrategy" class="org.jboss.jpa.resolvers.strategy.SpecCompliantSearchStrategy"/>
-
<bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
<bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
Modified: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -31,10 +31,6 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.dependency.plugins.graph.Search;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.graph.GraphController;
-import org.jboss.ejb3.embedded.JBossEJBContainer;
import org.jboss.ejb3.embedded.test.stateful.StatefulGreeter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -74,8 +70,6 @@
@Test
public void test1() throws NamingException
{
- Object bean = GraphController.class.cast(JBossEJBContainer.getKernel().getController()).getContext("jboss.j2ee:jar=tests-classes,name=StatefulGreeterBean,service=EJB3", ControllerState.INSTALLED, Search.WIDTH);
- System.out.println(bean);
InitialContext ctx = new InitialContext();
StatefulGreeter greeter = (StatefulGreeter) ctx.lookup("StatefulGreeterBean/local");
String now = new Date().toString();
Modified: projects/ejb3/trunk/ext-api/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/ext-api/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/ext-api/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 19:13:39 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/ext-api-impl/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/ext-api-impl/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/ext-api-impl/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 19:17:16 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/injection/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/injection/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/injection/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 19:19:50 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/interceptors/.classpath
===================================================================
--- projects/ejb3/trunk/interceptors/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/interceptors/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,49 +5,5 @@
<classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-aspects-common/1.0.0.Beta1/jboss-aspects-common-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-aspects-common/1.0.0.Beta1/jboss-aspects-common-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR2/jboss-dependency-2.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR2/jboss-dependency-2.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR2/jboss-kernel-2.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR2/jboss-kernel-2.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR1/jboss-managed-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR1/jboss-managed-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR1/jboss-metatype-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR1/jboss-metatype-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP1/jboss-security-spi-2.0.2.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP1/jboss-security-spi-2.0.2.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/1.0.2/trove-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -79,8 +79,7 @@
// such that they make the Map of MethodHashes, and these then get improperly placed in the
// Joinpoint Map, which ends up here...
//assert methodApplicableInterceptorClasses != null : "applicable interceptors is non-existent for " + method;
- if(methodApplicableInterceptorClasses == null)
- log.warn("applicable interceptors is non-existent for " + method);
+ log.warn("applicable interceptors is non-existent for " + method);
return methodApplicableInterceptorClasses;
}
Modified: projects/ejb3/trunk/locator/.classpath
===================================================================
--- projects/ejb3/trunk/locator/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/locator/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -4,13 +4,5 @@
<classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/locator/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/locator/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/locator/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 19:29:00 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/Ejb3ServiceLocator.java
===================================================================
--- projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/Ejb3ServiceLocator.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/Ejb3ServiceLocator.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -226,7 +226,7 @@
* @param interfaze
* @param obj
*/
- private void addInterfaceAndSuperinterfacesToCache(Class<?> interfaze, Object obj)
+ private <T> void addInterfaceAndSuperinterfacesToCache(Class<T> interfaze, T obj)
{
// Ensure not already cached, escape
if (!this.isObjectCached(interfaze))
@@ -237,7 +237,7 @@
}
// Add all super interfaces recursively
- for (Class<?> superInterface : interfaze.getInterfaces())
+ for (Class<T> superInterface : interfaze.getInterfaces())
{
this.addInterfaceAndSuperinterfacesToCache(superInterface, obj);
}
Modified: projects/ejb3/trunk/pom.xml
===================================================================
--- projects/ejb3/trunk/pom.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/pom.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -58,9 +58,6 @@
<!-- module>sandbox</module -->
<module>security</module>
<module>test</module>
- <module>timerservice-as5</module>
- <module>timerservice-quartz</module>
- <module>timerservice-spi</module>
<module>transactions</module>
</modules>
Modified: projects/ejb3/trunk/pool/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/pool/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/pool/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Wed Nov 12 19:36:33 GMT-05:00 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/sandbox/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/sandbox/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/sandbox/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,5 +1,5 @@
-#Mon Jun 16 11:22:19 CEST 2008
+#Mon Oct 08 15:42:55 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/security/.classpath
===================================================================
--- projects/ejb3/trunk/security/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/security/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,52 +5,5 @@
<classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR4/jboss-metatype-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR4/jboss-metatype-2.0.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP1/jboss-security-spi-2.0.2.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP1/jboss-security-spi-2.0.2.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP1/jbosssx-2.0.2.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP1/jbosssx-2.0.2.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/1.0.2/trove-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/test/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/test/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,4 +1,5 @@
#Wed Nov 12 20:02:52 GMT-05:00 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/testsuite/.classpath
===================================================================
--- projects/ejb3/trunk/testsuite/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,6 +5,5 @@
<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="var" path="JBOSS_HOME/client/jbossall-client.jar"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
</classpath>
Modified: projects/ejb3/trunk/testsuite/.project
===================================================================
--- projects/ejb3/trunk/testsuite/.project 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/.project 2009-02-06 07:07:07 UTC (rev 83929)
@@ -6,11 +6,9 @@
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
- <!--
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
</buildCommand>
- -->
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
Modified: projects/ejb3/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,4 +1,4 @@
-#Mon Nov 17 13:23:15 CET 2008
+#Wed Nov 12 20:07:16 GMT-05:00 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/ejb3/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,10 +1,9 @@
-#Mon Nov 17 13:22:49 CET 2008
-activeProfiles=eclipse
+#Tue May 27 11:12:31 CEST 2008
+activeProfiles=
eclipse.preferences.version=1
filterResources=false
-fullBuildGoals=
includeModules=false
-resolveWorkspaceProjects=false
-resourceFilterGoals=
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
useMavenFolders=false
version=1
Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/build-test.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -270,6 +270,11 @@
<jvmarg value="-Djgroups.udp.ip_ttl=${jbosstest.udp.ip_ttl}" />
<jvmarg value="-Djboss.messaging.ServerPeerID=1" />
</server>
+
+ <!-- ejbthree1671 -->
+ <server name="ejbthree1671" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
</server:config>
@@ -384,6 +389,9 @@
<!-- Root of jndi.properties -->
<pathelement location="${resources}/test" />
+
+ <!-- Resources required on the client CP -->
+ <pathelement location="${location.target}/tests-classes/" />
<!-- Client JARs not on jbossall-client (Hack; see EJBTHREE-1416) -->
<pathelement location="${env.JBOSS_HOME}/lib/javassist.jar"/>
@@ -1526,6 +1534,8 @@
<jar jarfile="${build.lib}/multideploy.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/reference21_30/Test2*.class"/>
+ <include name="org/jboss/ejb3/test/reference21_30/Test3Business.class"/>
+ <include name="org/jboss/ejb3/test/reference21_30/Test3Home.class"/>
</fileset>
<fileset dir="${resources}/test/reference21_30">
<include name="META-INF/ejb-jar.xml"/>
@@ -2402,10 +2412,18 @@
<build-simple-jar name="ejbthree1504"/>
</target>
+ <target name="ejbthree1530">
+ <build-simple-jar name="ejbthree1530"/>
+ </target>
+
<target name="ejbthree1624">
<build-simple-jar name="ejbthree1624"/>
</target>
+ <target name="ejbthree1647">
+ <build-simple-jar name="ejbthree1647"/>
+ </target>
+
<target name="jbas4489"
description="Builds a simple jar files."
>
@@ -2471,6 +2489,10 @@
<jar jarfile="${build.lib}/sf-clientejb.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/regression/scopedclassloader/Client*.class"/>
+ <include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.class"/>
+ <include name="org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.class"/>
+ <include name="org/jboss/ejb3/test/regression/scopedclassloader/Customer.class"/>
+ <include name="org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.class"/>
</fileset>
</jar>
@@ -4171,6 +4193,31 @@
</fileset>
</jar>
</target>
+
+
+ <target name="ejbthree1671"
+ description="Builds the ear and jar file(s) needed for testing EJBTHREE-1671."
+ >
+
+ <mkdir dir="${build.lib}"/>
+ <!-- First build the jar file containing the EJBs -->
+ <jar jarfile="${build.lib}/ejbthree1671.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/ejbthree1671/*.class"/>
+ </fileset>
+ </jar>
+ <!-- Now build the EAR and include the EJB jar and the application.xml and jboss-app.xml -->
+ <jar jarfile="${build.lib}/ejbthree1671.ear">
+ <fileset dir="${build.lib}">
+ <include name="ejbthree1671.jar"/>
+ </fileset>
+ <fileset dir="${resources}/test/ejbthree1671">
+ <include name="META-INF/application.xml"/>
+ <include name="META-INF/jboss-app.xml"/>
+
+ </fileset>
+ </jar>
+ </target>
<target name="jars" depends="statefulproxyfactoryoverride, removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
concurrent,
@@ -4190,7 +4237,7 @@
ejbthree1066, ejbthree1071, ejbthree1075, ejbthree1082, ejbthree1090, ejbthree1092, ejbthree1116, ejbthree1119, ejbthree1122, ejbthree1123, ejbthree1127,
ejbthree1130,
ejbthree1146, ejbthree1148, ejbthree1154, ejbthree1157, ejbthree1222, ejbthree1271, ejbthree1339,
- ejbthree1504, ejbthree1624,
+ ejbthree1504, ejbthree1530, ejbthree1624, ejbthree1647,
jaxws, jbas4489, epcpropagation, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
securitydomain, enventry, security5,
jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions,
@@ -4199,7 +4246,7 @@
timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
localcall, interceptors, interceptors2, interceptors3, iiop, clientinterceptor,
- statelesscreation, changexml, externalrefscoped, singleton"/>
+ statelesscreation, changexml, externalrefscoped, singleton, ejbthree1671"/>
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
@@ -4466,15 +4513,7 @@
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/${test}/unit/*TestCase.class"/>
- </fileset>
- </batchtest>
+ <test name="${test}" todir="${build.reports}"/>
</junit>
</target>
@@ -5004,9 +5043,15 @@
<antcall target="test" inheritRefs="true">
<param name="test" value="ejbthree1339"/>
</antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree1530"/>
+ </antcall>
<antcall target="test" inheritRefs="true">
<param name="test" value="ejbthree1624"/>
</antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree1647"/>
+ </antcall>
<antcall target="test" inheritRefs="true">
<param name="test" value="statelesscreation"/>
</antcall>
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -21,6 +21,7 @@
*/
package org.jboss.ejb3.test.asynchronous.unit;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import javax.ejb.EJBAccessException;
@@ -163,7 +164,7 @@
SecurityClient client = SecurityClientFactory.getSecurityClient();
client.setSimple("rolefail","password");
client.login();
-
+
asynchTester.method(61);
Object ret = getReturnOrException(ap);
assertTrue("SecurityException not thrown: " + ret, ret instanceof EJBAccessException);
@@ -176,13 +177,17 @@
ret = getReturnOrException(ap);
assertTrue("SecurityException not thrown: " + ret, ret instanceof EJBAccessException);
+ client.logout();
client.setSimple("somebody","password");
+ client.login();
asynchTester.method(64);
ret = getReturnOrException(ap);
assertEquals("Wrong return for authorized method", 64, ret);
+ client.logout();
client.setSimple("nosuchuser","password");
+ client.login();
asynchTester.method(65);
ret = getReturnOrException(ap);
@@ -194,7 +199,15 @@
Future<?> future = provider.getFutureResult();
waitForFuture(future);
- return future.get();
+ try
+ {
+ return future.get();
+ }
+ catch(ExecutionException e)
+ {
+ log.debug("Exception", e);
+ return e.getCause();
+ }
}
private void waitForFuture(Future<?> future) throws InterruptedException
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/unit/ChangeXMLUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/unit/ChangeXMLUnitTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/unit/ChangeXMLUnitTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -23,11 +23,21 @@
import java.io.File;
+import junit.framework.Test;
+
import org.jboss.ejb3.test.changexml.TesterRemote;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
/**
+ * The purpose of this test is to show that the meta data bridges dynamically
+ * pick up configuration changes.
+ *
+ * As an example we modify the security domain. Note that because we have
+ * an unauthenticated principal on the "other" security domain, we set some fake
+ * credentials to make sure the security domain gets exercised.
+ *
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
*/
public class ChangeXMLUnitTestCase extends JBossTestCase
@@ -39,10 +49,20 @@
public void testChangeXML() throws Exception
{
- TesterRemote tester = (TesterRemote)getInitialContext().lookup("TesterBean/remote");
- String deployDir = System.getProperty("jbosstest.deploy.dir");
- File file = new File(deployDir + "/" + "changexml.jar");
- tester.runTest(file.toURL());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
+ try
+ {
+ TesterRemote tester = (TesterRemote)getInitialContext().lookup("TesterBean/remote");
+ String deployDir = System.getProperty("jbosstest.deploy.dir");
+ File file = new File(deployDir + "/" + "changexml.jar");
+ tester.runTest(file.toURL());
+ }
+ finally
+ {
+ client.logout();
+ }
}
public static Test suite() throws Exception
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -50,7 +50,14 @@
//Just a sanity test
InitialContext ctx = getInitialContext();
FacadeRemote facade = (FacadeRemote)ctx.lookup("FacadeBean/remote");
- facade.callWovenBeanWithAnnotatedLocal();
+ try
+ {
+ facade.callWovenBeanWithAnnotatedLocal();
+ }
+ catch(RuntimeException e)
+ {
+ fail(e.getMessage());
+ }
}
public void testDefaultLocalInterfaceWovenBean() throws Exception
@@ -58,7 +65,14 @@
//The real test for this issue
InitialContext ctx = getInitialContext();
FacadeRemote facade = (FacadeRemote)ctx.lookup("FacadeBean/remote");
- facade.callWovenBeanWithDefaultLocal();
+ try
+ {
+ facade.callWovenBeanWithDefaultLocal();
+ }
+ catch(RuntimeException e)
+ {
+ fail(e.getMessage());
+ }
}
public static Test suite() throws Exception
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1624/AccessBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1624/AccessBean.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1624/AccessBean.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -24,7 +24,6 @@
import javax.ejb.Remote;
import org.jboss.ejb3.annotation.Service;
-import org.jboss.ejb3.common.registrar.spi.DuplicateBindException;
import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.common.registrar.spi.NotBoundException;
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -21,9 +21,11 @@
*/
package org.jboss.ejb3.test.ejbthree973;
+import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.Remote;
+import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import org.jboss.ejb3.annotation.SecurityDomain;
@@ -40,6 +42,9 @@
@RolesAllowed("Spy")
public class SpyAllowedBean implements SpyMe
{
+ @Resource
+ private SessionContext ctx;
+
@EJB(beanName="WhoAmIBean")
private WhoAmI whoAmIBean;
@@ -51,7 +56,16 @@
@RolesAllowed("nobody")
public void notAllowed()
{
- throw new RuntimeException("should not come here");
+ String me;
+ try
+ {
+ me = ctx.getCallerPrincipal().getName();
+ }
+ catch(Exception e)
+ {
+ me = "<error: " + e.getMessage() + ">";
+ }
+ throw new RuntimeException(me + " should not come here");
}
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -22,6 +22,7 @@
package org.jboss.ejb3.test.ejbthree973.unit;
import javax.ejb.EJBAccessException;
+import javax.ejb.EJBTransactionRolledbackException;
import javax.jms.DeliveryMode;
import javax.jms.MessageConsumer;
import javax.jms.Queue;
@@ -131,6 +132,13 @@
{
// this is good
}
+ catch(EJBTransactionRolledbackException e)
+ {
+ Throwable t = e.getCause();
+ if(t != null && t instanceof RuntimeException)
+ fail(t.getMessage());
+ throw e;
+ }
String actual = bean.getCallerPrincipal();
// "anonymous" is defined in the @SecurityDomain on WhoAmIBean
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptormetadata/MockDependencyPolicy.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptormetadata/MockDependencyPolicy.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptormetadata/MockDependencyPolicy.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -47,5 +47,10 @@
{
throw new RuntimeException("NYI");
}
+
+ public MockDependencyPolicy clone()
+ {
+ return new MockDependencyPolicy();
+ }
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -21,13 +21,19 @@
*/
package org.jboss.ejb3.test.invoker.unit;
+import java.lang.reflect.UndeclaredThrowableException;
import java.util.Properties;
+
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import junit.framework.Test;
+import junit.framework.TestCase;
+
import org.jboss.ejb3.test.invoker.StatelessRemote;
import org.jboss.logging.Logger;
+import org.jboss.remoting.transport.http.WebServerError;
import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -41,23 +47,43 @@
{
super(name);
}
-
+
public void testHttp() throws Exception
{
Properties props = new Properties();
- props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
+ props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
InitialContext jndiContext = new InitialContext(props);
//InitialContext jndiContext = new InitialContext();
-
- StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessHttp");
+
+ StatelessRemote stateless = null;
+ try
+ {
+ stateless = (StatelessRemote) jndiContext.lookup("StatelessHttp");
+ }
+ catch (NamingException ne)
+ {
+ Throwable namingCause = ne.getCause();
+ if (namingCause != null && namingCause instanceof UndeclaredThrowableException)
+ {
+ Throwable undeclaredCause = namingCause.getCause();
+ if (undeclaredCause != null && undeclaredCause instanceof WebServerError)
+ {
+ String error = "Test failed due to problem w/ remoting transport";
+ log.error(error + " :" + undeclaredCause);
+ TestCase.fail(error);
+ }
+ }
+ }
assertNotNull(stateless);
-
- try
+
+ try
{
- assertEquals("echo", stateless.echo("echo"));
- } catch (Exception e){
+ assertEquals("echo", stateless.echo("echo"));
+ }
+ catch (Exception e)
+ {
e.printStackTrace();
}
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -50,8 +50,6 @@
import org.jboss.ejb3.test.mdb.Stateless;
import org.jboss.ejb3.test.mdb.TestStatus;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
@@ -359,64 +357,6 @@
assertEquals(1, status.cmtQueueRan());
}
- /**
- * Test that expired messages are moved to a separate queue.
- */
- public void testExpiredMessagesMove() throws Exception
- {
- QueueConnection connection = null;
- QueueSender sender = null;
- QueueSession session = null;
-
- QueueConnectionFactory factory = getQueueConnectionFactory();
- connection = factory.createQueueConnection();
- connection.start();
- session = connection.createQueueSession(false,
- QueueSession.AUTO_ACKNOWLEDGE);
-
- Queue queue = (Queue) getInitialContext().lookup("queue/expirytest");
- sender = session.createSender(queue);
-
- Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
-
- removeAllMessagesFromDLQ();
-
- long now = System.currentTimeMillis();
-
- TextMessage message = session.createTextMessage();
- message.setStringProperty("foo", "bar");
- message.setStringProperty("null", null);
- String text = "expire on server";
- message.setText(text);
-
- sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 1);
-
- Thread.sleep(1000 * 5);
-
- assertSize(session, queue, 0);
-
- /* TODO: await implementation of JBMESSAGING-126
- assertSize(session, dlq, 1);
-
- QueueReceiver receiver = session.createReceiver(dlq);
- message = (TextMessage) receiver.receiveNoWait();
- assertNotNull(message);
- assertEquals("QUEUE.expirytest", message
- .getStringProperty("JBOSS_ORIG_DESTINATION"));
- assertTrue(message.getLongProperty("JBOSS_ORIG_EXPIRATION") > now);
- assertEquals(0L, message.getJMSExpiration());
- assertEquals(text, message.getText());
- assertEquals("bar", message.getStringProperty("foo"));
- assertNull(message.getStringProperty("null"));
-
- receiver.close();
- */
- sender.close();
-
- session.close();
- connection.close();
- }
-
public void testDlqMaxResent() throws Exception
{
QueueConnection connection = null;
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -21,8 +21,21 @@
*/
package org.jboss.ejb3.test.persistenceunits.unit;
+import java.io.IOException;
import java.util.Map;
+import javax.management.Attribute;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.MBeanException;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import junit.extensions.TestSetup;
import junit.framework.Test;
import org.jboss.deployers.client.spi.IncompleteDeploymentException;
@@ -31,6 +44,7 @@
import org.jboss.ejb3.test.persistenceunits.Entity1;
import org.jboss.ejb3.test.persistenceunits.Entity2;
import org.jboss.ejb3.test.persistenceunits.EntityTest;
+import org.jboss.injection.PersistenceUnitHandler;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
@@ -90,13 +104,53 @@
assertEquals("only persistenceunitscope-test2.ear should have failed", 1, deploymentsInError.size());
Map.Entry<String, Throwable> entry = deploymentsInError.entrySet().iterator().next();
assertTrue(entry.getKey().endsWith("persistenceunitscope-test2.ear"));
- assertTrue(entry.getValue().getMessage().contains("Can't find a persistence unit named 'Entity1'"));
+
+ // Check that it's Entity1 PU that cannot be resolved
+ String message = entry.getValue().getMessage();
+ assertTrue(message.contains(PersistenceUnitHandler.ERROR_MESSAGE_FAILED_TO_RESOVLE_PU));
+ assertTrue(message.contains("Entity1"));
}
}
public static Test suite() throws Exception
{
- return getDeploySetup(MultipleEarTestCase.class, "persistenceunitscope-test1.ear, persistenceunitscope-test2.ear");
+ Test test = getDeploySetup(MultipleEarTestCase.class, "persistenceunitscope-test1.ear, persistenceunitscope-test2.ear");
+ TestSetup setup = new TestSetup(test) {
+ private ObjectName on = new ObjectName("jboss.pojo:name='PersistenceUnitDependencyResolver'");
+
+ private boolean previousSetting = false;
+
+ private Object getAttribute(ObjectName on, String name) throws AttributeNotFoundException, InstanceNotFoundException, MBeanException, ReflectionException, IOException, Exception
+ {
+ return getServer().getAttribute(on, name);
+ }
+
+ // TODO: should come from JBossTestServices
+ private MBeanServerConnection getServer() throws NamingException
+ {
+ String adaptorName = System.getProperty("jbosstest.server.name", "jmx/invoker/RMIAdaptor");
+ return (MBeanServerConnection) new InitialContext().lookup(adaptorName);
+ }
+
+ private void setAttribute(ObjectName on, String name, Object value) throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException, IOException, Exception
+ {
+ getServer().setAttribute(on, new Attribute(name, value));
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ previousSetting = (Boolean) getAttribute(on, "SpecCompliant");
+ setAttribute(on, "SpecCompliant", true);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ setAttribute(on, "SpecCompliant", previousSetting);
+ }
+ };
+ return setup;
}
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -32,7 +32,6 @@
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import org.jboss.util.xml.JBossEntityResolver;
-import org.w3c.dom.Document;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
@@ -184,7 +183,6 @@
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/securitydomain/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/service/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/servicexmbean/META-INF/jboss.xml", builder);
- validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/servlet/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/ssladvanced/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/stateful/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/strictpool/META-INF/jboss.xml", builder);
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/ServiceFive.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/ServiceFive.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/ServiceFive.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -59,7 +59,6 @@
public void create() throws Exception
{
System.out.println("ServiceFive - CREATE");
- new Exception().printStackTrace();
Tester.creates.add("5");
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -28,7 +28,6 @@
import javax.management.AttributeList;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import javax.naming.Context;
import junit.framework.Test;
@@ -38,8 +37,6 @@
import org.jboss.ejb3.test.service.ServiceTwoRemote;
import org.jboss.ejb3.test.service.SessionRemote;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
@@ -84,11 +81,12 @@
public void testSecurityDomain() throws Exception
{
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("invalid", "invalid");
+ client.login();
+
try
{
- SecurityClient client = SecurityClientFactory.getSecurityClient();
- client.logout();
-
ServiceOneRemote test = (ServiceOneRemote) getInitialContext().lookup("ServiceOne/remote");
test.testEjbInjection();
fail("Should have thrown EJBAccessException");
@@ -97,6 +95,10 @@
{
}
+ finally
+ {
+ client.logout();
+ }
}
public void testServiceWithDefaultRemoteJNDIName() throws Exception
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -59,7 +59,7 @@
@RemoteBinding(jndiBinding = "Stateful",
interceptorStack="RemoteBindingStatefulSessionClientInterceptors",
factory = RemoteBindingDefaults.PROXY_FACTORY_STATEFUL_REMOTE)
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 5)
@SecurityDomain("test")
@Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
public class StatefulBean implements org.jboss.ejb3.test.stateful.Stateful
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java 2009-02-06 07:07:07 UTC (rev 83929)
@@ -24,16 +24,13 @@
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
+import junit.framework.Test;
+
import org.jboss.ejb3.test.stateful.Stateful;
-
import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.SecurityAssociation;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
+import org.jboss.test.JBossTestCase;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -42,40 +39,62 @@
extends JBossTestCase
{
private static final Logger log = Logger.getLogger(MetricsUnitTestCase.class);
+
+ private SecurityClient client = null;
public MetricsUnitTestCase(String name)
{
-
super(name);
-
}
- public void testJmxMetrics() throws Exception
+ @Override
+ protected void setUp() throws Exception
{
- SecurityClient client = SecurityClientFactory.getSecurityClient();
+ super.setUp();
+
+ this.client = SecurityClientFactory.getSecurityClient();
client.setSimple("somebody", "password");
client.login();
-
- MBeanServerConnection server = getServer();
-
- testJmxMetrics(server, "Stateful", "jboss.j2ee:jar=stateful-test.jar,name=StatefulBean,service=EJB3");
- testJmxMetrics(server, "TreeCacheStateful", "jboss.j2ee:jar=stateful-test.jar,name=TreeCacheStatefulBean,service=EJB3");
}
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(MetricsUnitTestCase.class, "stateful-test.jar");
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if(client == null)
+ return;
+ client.logout();
+ client = null;
+
+ super.tearDown();
+ }
+
protected void testJmxMetrics(MBeanServerConnection server, String jndiBinding, String objectName) throws Exception
{
ObjectName testerName = new ObjectName(objectName);
- System.out.println("testPassivation");
+ // Get the start cache size
+ int startCacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+
+ // Establish how many beans are already active
+ int prevCount = (Integer)server.getAttribute(testerName, "CreateCount");
+ System.out.println("prevCount = " + prevCount);
+ assertTrue("can't have negative creation count", prevCount >= 0);
+
Stateful stateful = (Stateful)getInitialContext().lookup(jndiBinding);
assertNotNull(stateful);
stateful.setState("state");
int count = (Integer)server.getAttribute(testerName, "CreateCount");
- assertEquals(1, count);
+ assertEquals(1, count - prevCount);
- int size = (Integer)server.getAttribute(testerName, "CacheSize");
- assertEquals(1, size);
+ // Ensure cache is incremented
+ int newCacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+ assertEquals(startCacheSize+1, newCacheSize);
assertEquals("state", stateful.getState());
stateful.testSerializedState("state");
@@ -85,11 +104,11 @@
assertFalse(stateful.testSessionContext());
Thread.sleep(10 * 1000);
- size = (Integer)server.getAttribute(testerName, "CacheSize");
- assertEquals(0, size);
+ int cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+ assertEquals(0, cacheSize);
count = (Integer)server.getAttribute(testerName, "PassivatedCount");
- assertEquals(1, count);
+ assertEquals(1, count - prevCount);
assertTrue(stateful.wasPassivated());
assertEquals("state", stateful.getState());
@@ -106,33 +125,47 @@
stateful.testResources();
count = (Integer)server.getAttribute(testerName, "CreateCount");
- assertEquals(2, count);
+ assertEquals(2, count - prevCount);
- size = (Integer)server.getAttribute(testerName, "CacheSize");
- assertEquals(2, size);
+ // the injected beans are passivated at this point in time
- size = (Integer)server.getAttribute(testerName, "RemoveCount");
- assertEquals(0, size);
+ cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+ assertEquals(2, cacheSize);
+ // keep in mind, we're not removing already injected beans
+
+ cacheSize = (Integer)server.getAttribute(testerName, "RemoveCount");
+ assertEquals(0, cacheSize);
+
another.removeMe();
- size = (Integer)server.getAttribute(testerName, "CacheSize");
- assertEquals(1, size);
+ cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+ assertEquals(1, cacheSize);
- size = (Integer)server.getAttribute(testerName, "RemoveCount");
- assertEquals(1, size);
+ cacheSize = (Integer)server.getAttribute(testerName, "RemoveCount");
+ assertEquals(1, cacheSize);
stateful.removeMe();
- size = (Integer)server.getAttribute(testerName, "CacheSize");
- assertEquals(0, size);
+ cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+ assertEquals(0, cacheSize);
- size = (Integer)server.getAttribute(testerName, "RemoveCount");
- assertEquals(2, size);
+ cacheSize = (Integer)server.getAttribute(testerName, "RemoveCount");
+ assertEquals(2, cacheSize);
}
- public static Test suite() throws Exception
+ public void testJmxMetricsStateful() throws Exception
{
- return getDeploySetup(MetricsUnitTestCase.class, "stateful-test.jar");
+ MBeanServerConnection server = getServer();
+
+ // Note: we got one creation in ServiceBean
+
+ testJmxMetrics(server, "Stateful", "jboss.j2ee:jar=stateful-test.jar,name=StatefulBean,service=EJB3");
}
+
+ public void testJmxMetricsTreeCacheStateful() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ testJmxMetrics(server, "TreeCacheStateful", "jboss.j2ee:jar=stateful-test.jar,name=TreeCacheStatefulBean,service=EJB3");
+ }
}
Modified: projects/ejb3/trunk/testsuite/src/test/resources/known-issues.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/known-issues.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/known-issues.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -21,9 +21,12 @@
<entry key="org.jboss.ejb3.test.defaultremotebindings.unit.DefaultRemoteBindingsTestCase.testDefault">show</entry>
<!-- EJBTHREE-1633 -->
<entry key="org.jboss.ejb3.test.dd.mdb.unit.MDBUnitTestCase.testQueue">show</entry>
+ <entry key="org.jboss.ejb3.test.dd.mdb.unit.MDBUnitTestCase.testTopic">show</entry>
<entry key="org.jboss.ejb3.test.dd.mdb.unit.MDBUnitTestCase.testDurableTopic">show</entry>
<!-- EJBTHREE-1634 -->
<entry key="org.jboss.ejb3.test.deployer.unit.DeployerUnitTestCase.testDeployEjb3ExtensionOnly">show</entry>
+ <!-- EJBTHREE-1651 -->
+ <entry key="org.jboss.ejb3.test.ejbthree973.unit.AnonymousCallerPrincipalTestCase.testSpy">show</entry>
<!-- EJBTHREE-1222 / EJBTHREE-1621 -->
<entry key="org.jboss.ejb3.test.ejbthree1222.unit.RegularRemoveMethodUnitTestCase.testRemoteNormalMethodNamedRemove">show</entry>
<entry key="org.jboss.ejb3.test.ejbthree1222.unit.RegularRemoveMethodUnitTestCase.testLocalNormalMethodNamedRemove">show</entry>
@@ -34,6 +37,16 @@
<!-- EJBTHREE-1640 -->
<entry key="org.jboss.ejb3.test.statefulproxyfactoryoverride.unit.RemoteUnitTestCase.testRemoteBindingProxyFactory">show</entry>
<entry key="org.jboss.ejb3.test.statefulproxyfactoryoverride.unit.RemoteUnitTestCase.testDeploymentDescriptorRemoteBindingProxyFactory">show</entry>
+ <!-- EJBTHREE-1656 -->
+ <entry key="org.jboss.ejb3.test.stateless.unit.StatelessTestCase.testTemplateInterfaceTx">show</entry>
+ <!-- EJBTHREE-1665 -->
+ <entry key="org.jboss.ejb3.test.ejbthree1023.unit.DefaultLocalInterfaceWovenBeanTestCase.testAnnotatedLocalInterfaceWovenBean">show</entry>
+ <entry key="org.jboss.ejb3.test.ejbthree1023.unit.DefaultLocalInterfaceWovenBeanTestCase.testDefaultLocalInterfaceWovenBean">show</entry>
<!-- JBMETA-157 -->
<entry key="org.jboss.ejb3.test.naming.unit.NamingTestCase.testJndiOverride">show</entry>
+ <!-- EJBTHREE-1647 -->
+ <entry key="org.jboss.ejb3.test.ejbthree1647.unit.ResourceInjectionIntoPrimitivesTestCase.testStringInjectionUsingResourceMappedName">show</entry>
+ <entry key="org.jboss.ejb3.test.ejbthree1647.unit.ResourceInjectionIntoPrimitivesTestCase.testIntInjectionUsingResourceMappedName">show</entry>
+ <entry key="org.jboss.ejb3.test.ejbthree1647.unit.ResourceInjectionIntoPrimitivesTestCase.testIntegerInjectionUsingResourceMappedName">show</entry>
+
</properties>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=queuetest">
+ name="jboss.mq.destination:service=Queue,name=inflowmdbtest">
<attribute name="JNDIName">queue/inflowmdbtest</attribute>
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
</mbean>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss2.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss2.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss2.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -8,7 +8,9 @@
<enterprise-beans>
<session>
<ejb-name>StatefulOverrideBean</ejb-name>
- <jndi-name>StatefulOverride</jndi-name>
+ <remote-binding>
+ <jndi-name>StatefulOverride</jndi-name>
+ </remote-binding>
</session>
</enterprise-beans>
</jboss>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/service/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/service/META-INF/jboss.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/service/META-INF/jboss.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -5,8 +5,6 @@
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
version="3.0">
- <!-- Force no unauthenticated-principal (this is against spec!) -->
- <!-- unauthenticated-principal></unauthenticated-principal -->
<enterprise-beans>
<service>
<ejb-name>ServiceSix</ejb-name>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/tck5sec/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/tck5sec/META-INF/jboss.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/tck5sec/META-INF/jboss.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -14,4 +14,16 @@
</security-identity>
</session>
</enterprise-beans>
+ <!-- EJBTHREE-1666: work around -->
+ <assembly-descriptor>
+ <security-role>
+ <role-name>Manager</role-name>
+ <principal-name>javajoe</principal-name>
+ </security-role>
+ <security-role>
+ <role-name>Employee</role-name>
+ <principal-name>javajoe</principal-name>
+ <principal-name>j2ee</principal-name>
+ </security-role>
+ </assembly-descriptor>
</jboss>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -14,11 +14,17 @@
ServletServerInvoker for processing.
</description>
<servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
- <init-param>
+ <!--init-param>
<param-name>invokerName</param-name>
<param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
<description>The servlet server invoker</description>
+ </init-param-->
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://${jboss.bind.address}:8080/servlet-invoker/ServerInvokerServlet</param-value>
+ <description>The servlet server invoker</description>
</init-param>
+
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-jboss-beans.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-jboss-beans.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -7,8 +7,6 @@
<bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
- <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
-
<bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
<!-- TODO: allow for configuration
<property name="dependencies">
@@ -44,7 +42,6 @@
</uninstall>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
<property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
<property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
<property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
Modified: projects/ejb3/trunk/timerservice-as5/pom.xml
===================================================================
--- projects/ejb3/trunk/timerservice-as5/pom.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/timerservice-as5/pom.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -25,16 +25,6 @@
<version.org.jboss.jboss-as>5.0.0.GA</version.org.jboss.jboss-as>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: projects/ejb3/trunk/timerservice-spi/pom.xml
===================================================================
--- projects/ejb3/trunk/timerservice-spi/pom.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/timerservice-spi/pom.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -29,4 +29,4 @@
<artifactId>jboss-ejb-api</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: projects/ejb3/trunk/transactions/.classpath
===================================================================
--- projects/ejb3/trunk/transactions/.classpath 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/transactions/.classpath 2009-02-06 07:07:07 UTC (rev 83929)
@@ -4,88 +4,5 @@
<classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" sourcepath="M2_REPO/apache-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.GA/jboss-aop-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-core/2.0.0.GA/jboss-aop-asintegration-core-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop-asintegration-core/2.0.0.GA/jboss-aop-asintegration-core-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-mc/2.0.0.GA/jboss-aop-asintegration-mc-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop-asintegration-mc/2.0.0.GA/jboss-aop-asintegration-mc-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.CR5/jboss-aop-mc-int-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.CR5/jboss-aop-mc-int-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR2/jboss-as-bootstrap-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR2/jboss-as-bootstrap-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR2/jboss-as-j2se-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR2/jboss-as-j2se-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR2/jboss-as-j2se-5.0.0.CR2-tests.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR2/jboss-as-jmx-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR2/jboss-as-jmx-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR2/jboss-as-main-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR2/jboss-as-main-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR2/jboss-as-mbeans-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR2/jboss-as-mbeans-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR2/jboss-as-system-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR2/jboss-as-system-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR2/jboss-as-system-jmx-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR2/jboss-as-system-jmx-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.CR5/jboss-classloader-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.CR5/jboss-classloader-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.CR5/jboss-classloading-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.CR5/jboss-classloading-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.CR5/jboss-classloading-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.CR5/jboss-classloading-vfs-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.CR5/jboss-deployers-client-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.CR5/jboss-deployers-client-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.CR5/jboss-deployers-core-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.CR5/jboss-deployers-core-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.CR5/jboss-deployers-impl-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.CR5/jboss-deployers-impl-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.CR5/jboss-deployers-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.CR5/jboss-deployers-vfs-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.CR5/jboss-deployers-vfs-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.CR5/jboss-deployers-vfs-spi-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR1/jboss-jca-api-1.5.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR1/jboss-jca-api-1.5.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR4/jboss-metatype-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR4/jboss-metatype-2.0.0.CR4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.4.0.CR2/jboss-remoting-2.4.0.CR2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP1/jboss-security-spi-2.0.2.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.SP1/jboss-security-spi-2.0.2.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR5/jboss-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR5/jboss-vfs-2.0.0.CR5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossjta/4.3.0.GA/jbossjta-4.3.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossts-common/4.3.0.GA/jbossts-common-4.3.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/pluggable-instrumentor/2.0.0.GA/pluggable-instrumentor-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/aop/pluggable-instrumentor/2.0.0.GA/pluggable-instrumentor-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/1.0.2/trove-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs 2009-02-06 07:07:07 UTC (rev 83929)
@@ -1,8 +1,8 @@
-#Tue Nov 25 12:07:18 CET 2008
+#Mon Jul 14 14:54:36 CEST 2008
activeProfiles=eclipse
eclipse.preferences.version=1
-fullBuildGoals=
+fullBuildGoals=process-test-resources
includeModules=false
resolveWorkspaceProjects=true
-resourceFilterGoals=
+resourceFilterGoals=process-resources resources\:testResources
version=1
Modified: projects/ejb3/trunk/transactions/src/test/resources/log4j.xml
===================================================================
--- projects/ejb3/trunk/transactions/src/test/resources/log4j.xml 2009-02-06 06:54:56 UTC (rev 83928)
+++ projects/ejb3/trunk/transactions/src/test/resources/log4j.xml 2009-02-06 07:07:07 UTC (rev 83929)
@@ -23,7 +23,7 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<param name="File" value="target/test.log"/>
- <param name="Threshold" value="ALL"/>
+ <param name="Threshold" value="INFO"/>
<param name="Append" value="false"/>
<!-- Rollover at midnight each day -->
@@ -61,7 +61,7 @@
<!-- ============================== -->
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="DEBUG"/>
+ <param name="Threshold" value="TRACE"/>
<param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
@@ -92,10 +92,6 @@
<priority value="DEBUG"/>
</category>
-->
-
- <category name="org.jboss.kernel">
- <priority value="DEBUG"/>
- </category>
<!--
| An example of enabling the custom TRACE level priority that is used
@@ -108,7 +104,7 @@
-->
<category name="org.jboss">
- <priority value="ALL"/>
+ <priority value="INFO"/>
</category>
<category name="org.jboss.ejb3">
More information about the jboss-cvs-commits
mailing list