a bit more cleanup and move stuff a bit

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1050 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 17, 2009 · 64c4288 · 64c4288
1 parent 578e9dd
commit 64c4288
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 33 deletions.
diff --git a/...ava/org/jboss/webbeans/examples/Game.java → ...rg/jboss/webbeans/test/examples/Game.java b/...ava/org/jboss/webbeans/examples/Game.java → ...rg/jboss/webbeans/test/examples/Game.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import javax.webbeans.Initializer;
 

diff --git a/...rg/jboss/webbeans/examples/Generator.java → ...oss/webbeans/test/examples/Generator.java b/...rg/jboss/webbeans/examples/Generator.java → ...oss/webbeans/test/examples/Generator.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import javax.webbeans.ApplicationScoped;
 import javax.webbeans.Produces;

diff --git a/...ava/org/jboss/webbeans/examples/Mock.java → ...rg/jboss/webbeans/test/examples/Mock.java b/...ava/org/jboss/webbeans/examples/Mock.java → ...rg/jboss/webbeans/test/examples/Mock.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;

diff --git a/...eans/examples/MockSentenceTranslator.java → ...test/examples/MockSentenceTranslator.java b/...eans/examples/MockSentenceTranslator.java → ...test/examples/MockSentenceTranslator.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 @Mock
 public class MockSentenceTranslator implements Translator { 

diff --git a/...a/org/jboss/webbeans/examples/Random.java → .../jboss/webbeans/test/examples/Random.java b/...a/org/jboss/webbeans/examples/Random.java → .../jboss/webbeans/test/examples/Random.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

diff --git a/...oss/webbeans/examples/SentenceParser.java → ...ebbeans/test/examples/SentenceParser.java b/...oss/webbeans/examples/SentenceParser.java → ...ebbeans/test/examples/SentenceParser.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...webbeans/examples/SentenceTranslator.java → ...ans/test/examples/SentenceTranslator.java b/...webbeans/examples/SentenceTranslator.java → ...ans/test/examples/SentenceTranslator.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import javax.ejb.Stateless;
 

diff --git a/...va/org/jboss/webbeans/examples/Tests.java → ...g/jboss/webbeans/test/examples/Tests.java b/...va/org/jboss/webbeans/examples/Tests.java → ...g/jboss/webbeans/test/examples/Tests.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;

diff --git a/...oss/webbeans/examples/TextTranslator.java → ...ebbeans/test/examples/TextTranslator.java b/...oss/webbeans/examples/TextTranslator.java → ...ebbeans/test/examples/TextTranslator.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import javax.webbeans.Initializer;
 

diff --git a/...g/jboss/webbeans/examples/Translator.java → ...ss/webbeans/test/examples/Translator.java b/...g/jboss/webbeans/examples/Translator.java → ...ss/webbeans/test/examples/Translator.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples;
+package org.jboss.webbeans.test.examples;
 
 import javax.ejb.Local;
 

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java
@@ -22,6 +22,10 @@
 import org.jboss.webbeans.resource.AbstractNaming;
 import org.jboss.webbeans.resources.spi.Naming;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.webbeans.test.mock.context.MockApplicationContext;
+import org.jboss.webbeans.test.mock.context.MockDependentContext;
+import org.jboss.webbeans.test.mock.context.MockRequestContext;
+import org.jboss.webbeans.test.mock.context.MockSessionContext;
 
 public class MockBootstrap extends WebBeansBootstrap
 { 

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockInitialContext.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockInitialContext.java
diff --git a/...ans/test/mock/MockApplicationContext.java → .../mock/context/MockApplicationContext.java b/...ans/test/mock/MockApplicationContext.java → .../mock/context/MockApplicationContext.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock;
+package org.jboss.webbeans.test.mock.context;
 
 import org.jboss.webbeans.context.ApplicationContext;
 import org.jboss.webbeans.context.beanmap.SimpleBeanMap;

diff --git a/...beans/test/mock/MockDependentContext.java → ...st/mock/context/MockDependentContext.java b/...beans/test/mock/MockDependentContext.java → ...st/mock/context/MockDependentContext.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock;
+package org.jboss.webbeans.test.mock.context;
 
 import org.jboss.webbeans.context.DependentContext;
 

diff --git a/...ebbeans/test/mock/MockRequestContext.java → ...test/mock/context/MockRequestContext.java b/...ebbeans/test/mock/MockRequestContext.java → ...test/mock/context/MockRequestContext.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock;
+package org.jboss.webbeans.test.mock.context;
 
 import org.jboss.webbeans.context.RequestContext;
 

diff --git a/...ebbeans/test/mock/MockSessionContext.java → ...test/mock/context/MockSessionContext.java b/...ebbeans/test/mock/MockSessionContext.java → ...test/mock/context/MockSessionContext.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock;
+package org.jboss.webbeans.test.mock.context;
 
 import org.jboss.webbeans.context.SessionContext;
 import org.jboss.webbeans.context.beanmap.SimpleBeanMap;

diff --git a/webbeans-ri/unit-tests.xml b/webbeans-ri/unit-tests.xml
@@ -33,8 +33,7 @@
          </run>
       </groups>
       <packages>
-         <package name="org.jboss.webbeans.test" />
-         <package name="org.jboss.webbeans.examples" />
+         <package name="org.jboss.webbeans.test.examples" />
          <package name="org.jboss.webbeans.test.unit.bootstrap" />
          <package name="org.jboss.webbeans.test.unit.context" />
          <package name="org.jboss.webbeans.test.unit.definition" />