3:40 a.m.
Author: pete.muir(a)jboss.org
Date: 2008-12-10 04:40:02 -0500 (Wed, 10 Dec 2008)
New Revision: 511
Added:
ri/trunk/examples/build.xml
Modified:
ri/trunk/pom.xml
ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs
ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs
ri/trunk/webbeans-ri/pom.xml
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java
Log:
add ejb3 embedded support
Added: ri/trunk/examples/build.xml
===================================================================
--- ri/trunk/examples/build.xml (rev 0)
+++ ri/trunk/examples/build.xml 2008-12-10 09:40:02 UTC (rev 511)
@@ -0,0 +1,59 @@
+<project basedir="." name="example.build.script"
default="restart">
+
+ <dirname property="wbri.dir"
file="${ant.file.example.build.script}/../" />
+
+ <property name="maven.dir" location="${wbri.dir}/maven" />
+
+ <property file="${wbri.dir}/build.properties"/>
+
+ <target name="package">
+ <maven target="package" basedir="${basedir}"/>
+ </target>
+
+ <target name="explode" depends="package">
+ <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.war"/>
+ <copy todir="${jboss.home}/server/default/deploy/${example.name}.war">
+ <fileset dir="${basedir}/target/${example.name}" />
+ </copy>
+ </target>
+
+ <target name="deploy" depends="package">
+ <copy todir="${jboss.home}/server/default/deploy/"
file="${basedir}/target/${example.name}.war"/>
+ </target>
+
+ <target name="clean">
+ <maven target="clean" basedir="${basedir}"/>
+ </target>
+
+ <target name="restart" depends="explode">
+ <touch
file="${jboss.home}/server/default/deploy/${example.name}.war/WEB-INF/web.xml"
/>
+ </target>
+
+ <target name="undeploy">
+ <delete dir="${jboss.home}/server/default/deploy/${example.name}.war"
failonerror="false" />
+ <delete file="${jboss.home}/server/default/deploy/${example.name}.war"
failonerror="false" />
+ </target>
+
+ <macrodef name="maven">
+ <attribute name="target" />
+ <attribute name="basedir" />
+ <element name="args" implicit="true"
optional="true" />
+ <sequential>
+ <java classname="org.codehaus.classworlds.Launcher"
fork="true" dir="@{basedir}">
+ <classpath>
+ <fileset dir="${maven.dir}/boot">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${maven.dir}/bin">
+ <include name="*.*" />
+ </fileset>
+ </classpath>
+ <sysproperty key="classworlds.conf"
value="${maven.dir}/bin/m2.conf" />
+ <sysproperty key="maven.home" value="${maven.dir}"
/>
+ <args />
+ <arg line="@{target}" />
+ </java>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2008-12-10 09:28:19 UTC (rev 510)
+++ ri/trunk/pom.xml 2008-12-10 09:40:02 UTC (rev 511)
@@ -46,12 +46,6 @@
<url>http://repository.jboss.org/maven2</url>
</repository>
<repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <snapshots />
- </repository>
- <repository>
<id>google-maven-repository</id>
<name>Google Maven Repository</name>
<url>http://google-maven-repository.googlecode.com/svn/repository/</...
@@ -154,7 +148,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-embedded</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Alpha1</version>
</dependency>
<dependency>
Modified: ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs 2008-12-10 09:28:19 UTC
(rev 510)
+++ ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs 2008-12-10 09:40:02 UTC
(rev 511)
@@ -1,4 +1,4 @@
-#Tue Dec 09 14:39:16 CET 2008
+#Wed Dec 10 10:36:17 CET 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Modified: ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs 2008-12-10 09:28:19 UTC (rev
510)
+++ ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs 2008-12-10 09:40:02 UTC (rev
511)
@@ -1,4 +1,4 @@
-#Tue Dec 09 14:39:16 CET 2008
+#Wed Dec 10 10:36:49 CET 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2008-12-10 09:28:19 UTC (rev 510)
+++ ri/trunk/webbeans-ri/pom.xml 2008-12-10 09:40:02 UTC (rev 511)
@@ -25,11 +25,11 @@
<classifier>jdk15</classifier>
</dependency>
- <!-- <dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-embedded</artifactId>
<scope>test</scope>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java
===================================================================
---
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2008-12-10
09:28:19 UTC (rev 510)
+++
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractEjbEmbeddableTest.java 2008-12-10
09:40:02 UTC (rev 511)
@@ -1,11 +1,19 @@
package org.jboss.webbeans.test;
+import java.net.URL;
+import java.util.Properties;
+import javax.ejb.EJBContainer;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+
+
public abstract class AbstractEjbEmbeddableTest extends AbstractTest
{
- /*@AfterClass
+ @AfterClass
public void afterClass()
{
EJBContainer current = EJBContainer.getCurrentEJBContainer();
@@ -35,6 +43,6 @@
URL url = Thread.currentThread().getContextClassLoader().getResource(path);
String s = url.toString();
return s.substring(0, s.length() - path.length());
- }*/
+ }
}
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java
===================================================================
---
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java 2008-12-10
09:28:19 UTC (rev 510)
+++
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanTest.java 2008-12-10
09:40:02 UTC (rev 511)
@@ -1,11 +1,18 @@
package org.jboss.webbeans.test;
+import javax.ejb.EJBException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.webbeans.examples.Translator;
+import org.testng.annotations.Test;
+
+
public class EnterpriseBeanTest extends AbstractEjbEmbeddableTest
{
- /*(a)Test(expectedExceptions=UnsupportedOperationException.class)
+ @Test(expectedExceptions=UnsupportedOperationException.class)
public void test() throws NamingException
{
@@ -26,6 +33,6 @@
throw new RuntimeException(e.getCausedByException());
}
}
- }*/
+ }
}