WBRI-233

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2406 1c488680-804c-0410-94cd-c6b725194a0e
weld · Apr 14, 2009 · 134fb92 · 134fb92
1 parent 23927a3
commit 134fb92
Show file tree

Hide file tree

Showing 20 changed files with 15 additions and 83 deletions.
diff --git a/porting-package/pom.xml b/porting-package/pom.xml
@@ -33,6 +33,11 @@
          <artifactId>el-ri</artifactId>
       </dependency>
 
+      <dependency>
+      	<groupId>org.jboss.webbeans</groupId>
+	      <artifactId>webbeans-core-test</artifactId>
+     </dependency>
+
    </dependencies>
 
 </project>
diff --git a/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java b/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
diff --git a/porting-package/src/main/resources/META-INF/jboss-test-harness.properties b/porting-package/src/main/resources/META-INF/jboss-test-harness.properties
@@ -1,5 +1,4 @@
 org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl
 org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl
 org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl
-org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl
 org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -37,13 +37,11 @@
       <dependency>
          <groupId>javax.el</groupId>
          <artifactId>el-api</artifactId>
-         <scope>test</scope>
       </dependency>
 
        <dependency>
          <groupId>javax.el</groupId>
          <artifactId>el-ri</artifactId>
-         <scope>test</scope>
       </dependency>
 
       <dependency>
@@ -60,7 +58,6 @@
       <dependency>
          <groupId>org.jboss.ejb3</groupId>
          <artifactId>jboss-ejb3-api</artifactId>
-         <scope>test</scope>
          <optional>true</optional>
          <exclusions>
             <exclusion>
@@ -83,6 +80,16 @@
       	<scope>test</scope>
       </dependency>
 
+      <dependency>
+      	<groupId>javax.transaction</groupId>
+      	<artifactId>jta</artifactId>
+    	</dependency>
+
+      <dependency>
+         <groupId>javax.persistence</groupId>
+         <artifactId>persistence-api</artifactId>
+      </dependency>
+
    </dependencies>
 
    <build>

diff --git a/...ebbeans/mock/MockConversationManager.java → ...ebbeans/mock/MockConversationManager.java b/...ebbeans/mock/MockConversationManager.java → ...ebbeans/mock/MockConversationManager.java
diff --git a/.../jboss/webbeans/mock/MockEELifecycle.java → .../jboss/webbeans/mock/MockEELifecycle.java b/.../jboss/webbeans/mock/MockEELifecycle.java → .../jboss/webbeans/mock/MockEELifecycle.java
diff --git a/.../jboss/webbeans/mock/MockEjBServices.java → .../jboss/webbeans/mock/MockEjBServices.java b/.../jboss/webbeans/mock/MockEjBServices.java → .../jboss/webbeans/mock/MockEjBServices.java
diff --git a/...boss/webbeans/mock/MockEjbDescriptor.java → ...boss/webbeans/mock/MockEjbDescriptor.java b/...boss/webbeans/mock/MockEjbDescriptor.java → ...boss/webbeans/mock/MockEjbDescriptor.java
diff --git a/...jboss/webbeans/mock/MockEjbDiscovery.java → ...jboss/webbeans/mock/MockEjbDiscovery.java b/...jboss/webbeans/mock/MockEjbDiscovery.java → ...jboss/webbeans/mock/MockEjbDiscovery.java
diff --git a/.../jboss/webbeans/mock/MockJmsServices.java → .../jboss/webbeans/mock/MockJmsServices.java b/.../jboss/webbeans/mock/MockJmsServices.java → .../jboss/webbeans/mock/MockJmsServices.java
diff --git a/.../jboss/webbeans/mock/MockJpaServices.java → .../jboss/webbeans/mock/MockJpaServices.java b/.../jboss/webbeans/mock/MockJpaServices.java → .../jboss/webbeans/mock/MockJpaServices.java
diff --git a/...boss/webbeans/mock/MockNamingContext.java → ...boss/webbeans/mock/MockNamingContext.java b/...boss/webbeans/mock/MockNamingContext.java → ...boss/webbeans/mock/MockNamingContext.java
diff --git a/...oss/webbeans/mock/MockResourceLoader.java → ...oss/webbeans/mock/MockResourceLoader.java b/...oss/webbeans/mock/MockResourceLoader.java → ...oss/webbeans/mock/MockResourceLoader.java
diff --git a/...s/webbeans/mock/MockResourceServices.java → ...s/webbeans/mock/MockResourceServices.java b/...s/webbeans/mock/MockResourceServices.java → ...s/webbeans/mock/MockResourceServices.java
diff --git a/...s/webbeans/mock/MockServletLifecycle.java → ...s/webbeans/mock/MockServletLifecycle.java b/...s/webbeans/mock/MockServletLifecycle.java → ...s/webbeans/mock/MockServletLifecycle.java
diff --git a/...ebbeans/mock/MockTransactionServices.java → ...ebbeans/mock/MockTransactionServices.java b/...ebbeans/mock/MockTransactionServices.java → ...ebbeans/mock/MockTransactionServices.java
diff --git a/...s/webbeans/mock/MockWebBeanDiscovery.java → ...s/webbeans/mock/MockWebBeanDiscovery.java b/...s/webbeans/mock/MockWebBeanDiscovery.java → ...s/webbeans/mock/MockWebBeanDiscovery.java
diff --git a/.../jboss/webbeans/mock/MockWebServices.java → .../jboss/webbeans/mock/MockWebServices.java b/.../jboss/webbeans/mock/MockWebServices.java → .../jboss/webbeans/mock/MockWebServices.java
diff --git a/...oss/webbeans/mock/MockXmlEnvironment.java → ...oss/webbeans/mock/MockXmlEnvironment.java b/...oss/webbeans/mock/MockXmlEnvironment.java → ...oss/webbeans/mock/MockXmlEnvironment.java
diff --git a/...n/java/org/jboss/webbeans/mock/el/EL.java → ...n/java/org/jboss/webbeans/mock/el/EL.java b/...n/java/org/jboss/webbeans/mock/el/EL.java → ...n/java/org/jboss/webbeans/mock/el/EL.java