djencks 2004/08/04 18:39:08
Modified: modules/assembly maven.xml project.xml
Log:
cleanup and add gbeans so remote deployment works and itests can be run
Revision Changes Path
1.7 +15 -14 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 18 Jul 2004 22:36:33 -0000 1.6
+++ maven.xml 4 Aug 2004 22:39:08 -0000 1.7
@@ -16,7 +16,7 @@
<j:set var="project.root"
value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
<!-- Determine what the top-level project root is -->
- <j:set var="distDir" value="${project.root}/target/assembly"/>
+ <j:set var="distDir"
value="${project.root}/target/${pom.groupId}-${pom.currentVersion}"/>
<!-- Load the global properties -->
<ant:property file="${project.root}/etc/global.properties"/>
@@ -42,6 +42,11 @@
<ant:delete dir="${distDir}"/>
</postGoal>
+ <!--compatibility with generic multiproject build -->
+ <preGoal name="jar:install">
+ <attainGoal name="assemble"/>
+ </preGoal>
+
<!-- ==================================================== -->
<!-- Assemble server installation from generated modules -->
<!-- ==================================================== -->
@@ -76,6 +81,11 @@
<ant:fileset dir="src/etc"/>
</ant:copy>
+ <!-- copy in data files -->
+ <ant:copy todir="${distDir}/var">
+ <ant:fileset dir="src/var"/>
+ </ant:copy>
+
<!-- Pre-load the server's repository -->
<ant:mkdir dir="${distDir}/repository"/>
<ant:copy todir="${distDir}/repository">
@@ -160,22 +170,13 @@
<ant:arg
value="${maven.repo.local}/tranql/rars/tranql-connector-SNAPSHOT.rar"/>
</ant:java>
- <!-- build the openejb database configuration -->
- <!--ant:echo>Building default database configuration</ant:echo>
+ <!-- build the itests configuration -->
+ <!--ant:echo>Building itests configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:jvmarg value="-ea"/>
<ant:arg value="- -install"/>
<ant:arg value="- -module"/>
- <ant:arg
value="${project.root}/modules/connector/target/openejb-jca-${pom.currentVersion}.rar"/>
- </ant:java-->
-
- <!-- build the itests configuration -->
- <ant:echo>Building itests configuration</ant:echo>
- <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
- <ant:jvmarg value="-ea"/>
- <ant:arg value="--install"/>
- <ant:arg value="--module"/>
<ant:arg
value="${project.root}/modules/itests/target/openejb-itests-beans2.jar"/>
- </ant:java>
+ </ant:java-->
</goal>
</project>
1.16 +77 -33 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 18 Jul 2004 22:36:33 -0000 1.15
+++ project.xml 4 Aug 2004 22:39:08 -0000 1.16
@@ -37,25 +37,6 @@
</properties>
</dependency>
- <!--dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-jca</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency-->
-
- <dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- <version>SNAPSHOT</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-itests</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
@@ -107,6 +88,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-jmxremoting</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -175,9 +165,9 @@
</dependency>
<dependency>
- <groupId>howl</groupId>
+ <groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
- <version>0.1.3</version>
+ <version>0.1.4</version>
<url>http://forge.objectweb.org/projects/howl</url>
<properties>
<repository>true</repository>
@@ -195,6 +185,15 @@
<dependency>
<groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+ <version>1.1-rc2</version>
+ <properties>
+ <clideployer>true</clideployer>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2eeschema</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -204,13 +203,44 @@
<dependency>
<groupId>tranql</groupId>
- <artifactId>tranql</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>tranql-connector</artifactId>
+ <version>SNAPSHOT</version>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <!-- jdbc timer WorkerPersistence -->
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.0.1</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <!--License is at
http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt -->
+ <!-- it is modified BSD -->
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp</url>
+ <!-- can we get by with 1.1.3.3_min?-->
+ <version>1.1.3.3</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
+
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
@@ -293,15 +323,6 @@
</dependency>
<dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
- <version>3.26</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8</version>
@@ -334,12 +355,25 @@
</dependency>
<dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>2.0.1</version>
+ <properties>
+ <lib>true</lib>
+ <server>true</server>
+ <deploy>true</deploy>
+ <clideployer>true</clideployer>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
<properties>
<repository>true</repository>
</properties>
+ <url>http://jakarta.apache.org/regexp</url>
</dependency>
<dependency>
@@ -369,6 +403,16 @@
<properties>
<lib>true</lib>
<deploy>true</deploy>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <properties>
+ <repository>true</repository>
</properties>
</dependency>
