Title: [2479] trunk/openejb2/modules/openejb-core: Move java to main/java moved test/ to test/java
- Revision
- 2479
- Author
- dblevins
- Date
- 2006-02-21 16:19:36 -0500 (Tue, 21 Feb 2006)
Log Message
Move java to main/java moved test/ to test/java
Modified Paths
Added Paths
- trunk/openejb2/modules/openejb-builder/src/main/
- trunk/openejb2/modules/openejb-builder/src/main/java/
- trunk/openejb2/modules/openejb-builder/src/test/java/
- trunk/openejb2/modules/openejb-builder/src/test/java/org/
- trunk/openejb2/modules/openejb-core/src/main/
- trunk/openejb2/modules/openejb-core/src/main/java/
- trunk/openejb2/modules/openejb-core/src/test/java/
- trunk/openejb2/modules/openejb-core/src/test/java/org/
- trunk/openejb2/modules/openejb-pkgen-builder/src/main/
- trunk/openejb2/modules/openejb-pkgen-builder/src/main/java/
Removed Paths
- trunk/openejb2/modules/openejb-builder/src/java/
- trunk/openejb2/modules/openejb-builder/src/test/org/
- trunk/openejb2/modules/openejb-core/src/bin/
- trunk/openejb2/modules/openejb-core/src/conf/
- trunk/openejb2/modules/openejb-core/src/etc/
- trunk/openejb2/modules/openejb-core/src/java/
- trunk/openejb2/modules/openejb-core/src/test/org/
- trunk/openejb2/modules/openejb-pkgen-builder/src/java/
Diff
Modified: trunk/openejb2/modules/openejb-builder/project.xml (2478 => 2479)
--- trunk/openejb2/modules/openejb-builder/project.xml 2006-02-21 20:27:16 UTC (rev 2478)
+++ trunk/openejb2/modules/openejb-builder/project.xml 2006-02-21 21:19:36 UTC (rev 2479)
@@ -436,8 +436,8 @@
<!-- =================== -->
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/java</directory>
Copied: trunk/openejb2/modules/openejb-builder/src/main/java (from rev 2477, trunk/openejb2/modules/openejb-builder/src/java) ( => )
Copied: trunk/openejb2/modules/openejb-builder/src/test/java/org (from rev 2477, trunk/openejb2/modules/openejb-builder/src/test/org)
Modified: trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/KernelHelper.java (2477 => 2479)
--- trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-02-21 08:46:49 UTC (rev 2477)
+++ trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/KernelHelper.java 2006-02-21 21:19:36 UTC (rev 2479)
@@ -44,7 +44,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
- * @version $Rev: $ $Date$
+ * @version $Rev$ $Date$
*/
public class KernelHelper {
public static final URI[] DEFAULT_PARENTID_ARRAY = new URI[] {URI.create("org/apache/geronimo/Server")};
Modified: trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockEJBInstanceContext.java (2477 => 2479)
--- trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/MockEJBInstanceContext.java 2006-02-21 08:46:49 UTC (rev 2477)
+++ trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockEJBInstanceContext.java 2006-02-21 21:19:36 UTC (rev 2479)
@@ -29,7 +29,7 @@
import org.openejb.proxy.EJBProxyFactory;
/**
- * @version $Rev: $ $Date$
+ * @version $Rev$ $Date$
*/
public class MockEJBInstanceContext implements EJBInstanceContext {
Modified: trunk/openejb2/modules/openejb-core/project.xml (2478 => 2479)
--- trunk/openejb2/modules/openejb-core/project.xml 2006-02-21 20:27:16 UTC (rev 2478)
+++ trunk/openejb2/modules/openejb-core/project.xml 2006-02-21 21:19:36 UTC (rev 2479)
@@ -417,8 +417,8 @@
<!-- =================== -->
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@@ -428,7 +428,7 @@
</excludes>
<resources>
<resource>
- <directory>${basedir}/src/test</directory>
+ <directory>${basedir}/src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
Copied: trunk/openejb2/modules/openejb-core/src/main/java (from rev 2478, trunk/openejb2/modules/openejb-core/src/java) ( => )
Copied: trunk/openejb2/modules/openejb-core/src/test/java/org (from rev 2478, trunk/openejb2/modules/openejb-core/src/test/org)
Modified: trunk/openejb2/modules/openejb-pkgen-builder/project.xml (2478 => 2479)
--- trunk/openejb2/modules/openejb-pkgen-builder/project.xml 2006-02-21 20:27:16 UTC (rev 2478)
+++ trunk/openejb2/modules/openejb-pkgen-builder/project.xml 2006-02-21 21:19:36 UTC (rev 2479)
@@ -149,6 +149,16 @@
<!-- =================== -->
<build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
@@ -157,14 +167,5 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
</unitTest>
- <resources>
- <resource>
- <targetPath>META-INF/schema</targetPath>
- <directory>${basedir}/src/schema</directory>
- <includes>
- <include>openejb-pkgen.xsd</include>
- </includes>
- </resource>
- </resources>
</build>
</project>
Copied: trunk/openejb2/modules/openejb-pkgen-builder/src/main/java (from rev 2478, trunk/openejb2/modules/openejb-pkgen-builder/src/java) ( => )
