dain 2004/04/14 00:54:32
Modified: modules/assembly maven.xml project.xml
Log:
Changed repository initialization code to not blindly include all openejb jars
Added Axion jars
Added deployment of default database
Revision Changes Path
1.2 +11 -4 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 6 Apr 2004 18:41:45 -0000 1.1
+++ maven.xml 14 Apr 2004 04:54:32 -0000 1.2
@@ -80,8 +80,7 @@
<ant:mkdir dir="${distDir}/repository"/>
<ant:copy todir="${distDir}/repository">
<ant:fileset dir="${maven.repo.local}">
- <ant:include name="openejb/**"/>
-
+<!-- <ant:include name="openejb/**"/>-->
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('repository') == 'true'}">
@@ -145,7 +144,15 @@
</ant:java>
<!-- build the itests configuration -->
- <ant:echo>Building server configuration</ant:echo>
+ <ant:echo>Building default database configuration</ant:echo>
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:arg value="--install"/>
+ <ant:arg value="--module"/>
+ <ant:arg value="${project.root}/modules/connector/target/jdbc.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:arg value="--install"/>
<ant:arg value="--module"/>
1.2 +33 -1 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 6 Apr 2004 18:41:45 -0000 1.1
+++ project.xml 14 Apr 2004 04:54:32 -0000 1.2
@@ -39,6 +39,12 @@
<dependency>
<groupId>openejb</groupId>
+ <artifactId>openejb-jca</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
<artifactId>openejb-itests</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
@@ -312,5 +318,31 @@
<repository>true</repository>
</properties>
</dependency>
+
+ <dependency>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ <version>1.0-M3-dev</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>1.0</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.3</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
</dependencies>
</project>
