dain 2004/04/01 17:36:51
Modified: modules/core maven.xml project.xml
Log:
Stubbed in a deployer and a simple test.
Deployment doesn't actually work, but we have a start.
Revision Changes Path
1.2 +38 -42 openejb/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/core/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 Mar 2004 07:14:42 -0000 1.1
+++ maven.xml 1 Apr 2004 22:36:51 -0000 1.2
@@ -3,45 +3,41 @@
<!-- $Revision$ $Date$ -->
<project default="default"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:xdoclet="common:xdoclet">
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:xmlbeans="geronimo:xmlbeans">
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- </preGoal>
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ </preGoal>
-<!--
- <postGoal name="jar:jar">
- <copy todir="${build.clienttools.src}">
- <fileset dir="${src.clienttools.dir}" >
- <include name="**/clienttools/**"/>
- <include name="**/admin/web/WebAdminBean**"/>
- <exclude name="**/CVS/**"/>
- <exclude name="**/javax/**"/>
- <exclude name="**/*.class"/>
- </fileset>
- </copy>
- <ant:jar destfile="${basedir}/target/geronimo-core-rmiclassloaderspi.jar"
- basedir="${basedir}/target/classes"
- includes="org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.class"/>
- <ant:jar todir="${basedir}/target/classes/htdocs">
- <fileset dir="${basedir}/src/java/org/openejb/admin/web/html"/>
- </ant:copy>
- </postGoal>
--->
-<!--
- <postGoal name="jar:jar">
- <ant:jar destfile="${basedir}/target/geronimo-core-rmiclassloaderspi.jar"
- basedir="${basedir}/target/classes"
- includes="org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.class"/>
- </postGoal>
+ <preGoal name="java:compile">
+ <xmlbeans:schema2java
+ sourcedir="${basedir}/src"
+ sourceschema="schema/openejb-jar.xsd"
+ xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
+ targetdir="${basedir}/target/xmlbeans"
+ cataloglocation="${basedir}/src/schema/resolver-catalog.xml"/>
+ </preGoal>
- <postGoal name="jar:jar">
- <ant:jar destfile="${basedir}/target/geronimo-schemas.jar"
- basedir="${basedir}/src/schema"
- includes="*.xsd"/>
- </postGoal>
--->
+ <preGoal name="test:compile">
+ <ant:mkdir dir="${basedir}/target/test-ejb-jar/META-INF"/>
+ <copy todir="${basedir}/target/test-ejb-jar/META-INF">
+ <fileset dir="${basedir}/src/test-ejb-jar/META-INF"/>
+ </copy>
+
+ <ant:javac srcdir="${basedir}/src/test-ejb-jar"
+ destdir="${basedir}/target/test-ejb-jar"
+ target="${maven.compile.target}"
+ debug="on"
+ fork="true">
+ <ant:classpath>
+ <ant:path refid="maven.dependency.classpath"/>
+ <ant:pathelement path="${maven.build.dest}"/>
+ </ant:classpath>
+ </ant:javac>
+
+ <ant:jar destfile="${basedir}/target/test-ejb-jar.jar"
+ basedir="${basedir}/target/test-ejb-jar"/>
+ </preGoal>
</project>
1.8 +24 -4 openejb/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/core/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 Mar 2004 16:19:54 -0000 1.7
+++ project.xml 1 Apr 2004 22:36:51 -0000 1.8
@@ -58,6 +58,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>DEV</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>DEV</version>
<properties>
@@ -112,6 +121,15 @@
<dependency>
<groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+ <version>DEV</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>DEV</version>
<properties>
@@ -263,8 +281,10 @@
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>DEV</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
</dependency>
-
</dependencies>
<!-- =================== -->
@@ -272,8 +292,8 @@
<!-- =================== -->
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/java</directory>
