djencks 2004/11/09 20:34:59
Modified: modules/core maven.xml project.xml
Log:
GERONIMO-402, 464. Split openejb and security deployment code into separate
modules
Revision Changes Path
1.6 +2 -46 openejb/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/core/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 9 Jul 2004 06:19:12 -0000 1.5
+++ maven.xml 10 Nov 2004 01:34:59 -0000 1.6
@@ -5,50 +5,6 @@
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
- xmlns:xmlbeans="geronimo:xmlbeans">
+ >
-<!-- <preGoal name="xdoc:jelly-transform">-->
-<!-- <attainGoal name="html2xdoc"/>-->
-<!-- </preGoal>-->
-
- <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>
-
- <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"
- source="${maven.compile.source}"
- 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"/>
-
- <!-- Build test-ear -->
- <ant:jar destfile="${basedir}/target/test-ear.ear" >
- <fileset dir="${basedir}/target">
- <include name="test-ejb-jar.jar"/>
- </fileset>
- <fileset dir="${basedir}/src/test-ear">
- <include name="META-INF/*"/>
- </fileset>
- </ant:jar>
- </preGoal>
</project>
1.33 +1 -15 openejb/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/core/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 6 Nov 2004 20:03:38 -0000 1.32
+++ project.xml 10 Nov 2004 01:34:59 -0000 1.33
@@ -32,20 +32,6 @@
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-xmlbeans-plugin</artifactId>
- <version>&geronimo-version;</version>
- <type>plugin</type>
- </dependency>
-
- <!-- needed for xmlbeans runtime-->
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean-apache</artifactId>
- <version>&xmlbeans-version;</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>&geronimo-version;</version>
<properties>
