dain 2005/03/22 14:36:08
Modified: modules/assembly maven.xml project.xml
Log:
Convert remaining tmporb references to openorb
Revision Changes Path
1.20 +7 -3 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.xml 8 Feb 2005 23:42:50 -0000 1.19
+++ maven.xml 22 Mar 2005 19:36:08 -0000 1.20
@@ -56,13 +56,17 @@
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('lib') == 'true'}">
<ant:copy todir="${libDir}" file="${artifact.path}"/>
- <j:set var="classpath" value="${classpath}
../lib/${artifact.name}"/>
+ <j:set var="classpathEntry" value="../lib/${artifact.name}"/>
</j:if>
<j:if test="${dependency.getProperty('endorsed') == 'true'}">
<ant:copy todir="${libDir}/endorsed"
file="${artifact.path}"/>
+ <j:set var="classpathEntry"
value="../lib/endorsed/${artifact.name}"/>
</j:if>
<j:if test="${dependency.getProperty('server') == 'true'}">
- <j:set var="server.classpath" value="${server.classpath}
../lib/${artifact.name}"/>
+ <j:set var="server.classpath" value="${server.classpath}
${classpathEntry}"/>
+ </j:if>
+ <j:if test="${dependency.getProperty('deploy') == 'true'}">
+ <j:set var="deploy.classpath" value="${deploy.classpath}
${classpathEntry}"/>
</j:if>
<j:if test="${dependency.getProperty('deploy') == 'true'}">
<j:set var="deploy.classpath" value="${deploy.classpath}
../lib/${artifact.name}"/>
1.46 +15 -13 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- project.xml 20 Mar 2005 07:37:38 -0000 1.45
+++ project.xml 22 Mar 2005 19:36:08 -0000 1.46
@@ -554,6 +554,7 @@
<version>${xerces_version}</version>
<properties>
<endorsed>true</endorsed>
+ <server>true</server>
</properties>
</dependency>
@@ -563,6 +564,7 @@
<version>${xml_parser_apis_version}</version>
<properties>
<endorsed>true</endorsed>
+ <server>true</server>
</properties>
</dependency>
@@ -629,36 +631,36 @@
</dependency>
<dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-ins</artifactId>
- <version>${openorb_version}</version>
+ <groupId>tmporb</groupId>
+ <artifactId>tmporb-ins</artifactId>
+ <version>${tmporb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-pss</artifactId>
- <version>${openorb_version}</version>
+ <groupId>tmporb</groupId>
+ <artifactId>tmporb-pss</artifactId>
+ <version>${tmporb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-ssl</artifactId>
- <version>${openorb_version}</version>
+ <groupId>tmporb</groupId>
+ <artifactId>tmporb-ssl</artifactId>
+ <version>${tmporb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-ots</artifactId>
- <version>${openorb_version}</version>
+ <groupId>tmporb</groupId>
+ <artifactId>tmporb-ots</artifactId>
+ <version>${tmporb_version}</version>
<properties>
<repository>true</repository>
</properties>
