You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/04/05 20:36:03 UTC
cvs commit: avalon-components/facilities/finder/test index.ent maven.xml project.xml
mcconnell 2004/04/05 11:36:03
Modified: facilities common-project.xml maven.xml
facilities/finder/api project.xml
facilities/finder/impl project.xml
facilities/finder/site project.xml
facilities/finder/test/conf block.xml
facilities/finder/test maven.xml project.xml
Added: facilities/finder/api index.ent
facilities/finder/impl index.ent
facilities/finder/site index.ent
facilities/finder/test index.ent
Removed: facilities/finder common-project.xml
Log:
Parameterize build using entity references.
Revision Changes Path
1.2 +1 -0 avalon-components/facilities/common-project.xml
Index: common-project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/common-project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common-project.xml 4 Apr 2004 17:09:36 -0000 1.1
+++ common-project.xml 5 Apr 2004 18:36:02 -0000 1.2
@@ -110,6 +110,7 @@
</includes>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
<includes>
1.3 +12 -1 avalon-components/facilities/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 5 Apr 2004 09:18:26 -0000 1.2
+++ maven.xml 5 Apr 2004 18:36:02 -0000 1.3
@@ -1,6 +1,17 @@
-<project default="multiproject:install" xmlns:j="jelly:core">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+
+<project default="multiproject:install" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
<j:set var="maven.multiproject.includes"
value="**/project.xml"/>
+
+ <preGoal name="java:jar-resources">
+ <echo>HELLO FROM FACILITIES</echo>
+ <ant:filter token="AVALON-FINDER-API-VERSION" value="&avalon-finder-api-version;"/>
+ <ant:filter token="AVALON-FINDER-IMPL-VERSION" value="&avalon-finder-impl-version;"/>
+ </preGoal>
</project>
1.4 +8 -4 avalon-components/facilities/finder/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/api/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:37 -0000 1.3
+++ project.xml 5 Apr 2004 18:36:02 -0000 1.4
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
+
+ <groupId>&avalon-finder-id;</groupId>
+ <id>&avalon-finder-api-id;</id>
+ <currentVersion>&avalon-finder-api-version;</currentVersion>
- <groupId>avalon-finder</groupId>
- <id>avalon-finder-api</id>
<name>Avalon Finder API</name>
<package>org.apache.avalon.finder</package>
-
<shortDescription>Avalon Finder API</shortDescription>
</project>
1.1 avalon-components/facilities/finder/api/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent"> %facility-entities;
1.5 +14 -10 avalon-components/facilities/finder/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 4 Apr 2004 17:09:37 -0000 1.4
+++ project.xml 5 Apr 2004 18:36:03 -0000 1.5
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
- <groupId>avalon-finder</groupId>
- <id>avalon-finder-impl</id>
- <name>Avalon Finder Implementation</name>
+ <groupId>&avalon-finder-id;</groupId>
+ <id>&avalon-finder-impl-id;</id>
+ <currentVersion>&avalon-finder-impl-version;</currentVersion>
+ <name>Avalon Finder Implementation</name>
<shortDescription>Avalon Finder Implementation</shortDescription>
<package>org.apache.avalon.finder.impl</package>
@@ -16,9 +20,9 @@
<!-- implementation dependencies -->
<dependency>
- <groupId>avalon-finder</groupId>
- <artifactId>avalon-finder-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-finder-id;</groupId>
+ <artifactId>&avalon-finder-api-id;</artifactId>
+ <version>&avalon-finder-api-version;</version>
</dependency>
<dependency>
@@ -28,9 +32,9 @@
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
1.1 avalon-components/facilities/finder/impl/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent"> %facility-entities;
1.4 +5 -2 avalon-components/facilities/finder/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/site/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:09:37 -0000 1.3
+++ project.xml 5 Apr 2004 18:36:03 -0000 1.4
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
- <groupId>avalon-finder</groupId>
+ <groupId>&avalon-finder-id;</groupId>
<id>avalon-finder-site</id>
<name>Avalon Finder Documentation</name>
1.1 avalon-components/facilities/finder/site/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent"> %facility-entities;
1.4 +2 -2 avalon-components/facilities/finder/test/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/test/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 5 Apr 2004 09:45:33 -0000 1.3
+++ block.xml 5 Apr 2004 18:36:03 -0000 1.4
@@ -3,8 +3,8 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-finder:avalon-finder-api" version="0.9.0"/>
- <resource id="avalon-finder:avalon-finder-impl" version="0.9.0"/>
+ <resource id="avalon-finder:avalon-finder-api" version="@AVALON-FINDER-API-VERSION@"/>
+ <resource id="avalon-finder:avalon-finder-impl" version="@AVALON-FINDER-IMPL-VERSION@"/>
</repository>
<fileset dir="target">
<include name="classes"/>
1.2 +12 -1 avalon-components/facilities/finder/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/test/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 4 Apr 2004 15:00:55 -0000 1.1
+++ maven.xml 5 Apr 2004 18:36:03 -0000 1.2
@@ -1,7 +1,18 @@
-<project default="test:test">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+
+<project default="test:test" xmlns:ant="jelly:ant">
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
+ </preGoal>
+
+ <preGoal name="java:jar-resources">
+ <echo>HELLO FROM TEST</echo>
+ <ant:filter token="AVALON-FINDER-API-VERSION" value="&avalon-finder-api-version;"/>
+ <ant:filter token="AVALON-FINDER-IMPL-VERSION" value="&avalon-finder-impl-version;"/>
</preGoal>
</project>
1.5 +11 -8 avalon-components/facilities/finder/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/facilities/finder/test/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 4 Apr 2004 17:09:37 -0000 1.4
+++ project.xml 5 Apr 2004 18:36:03 -0000 1.5
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../common-project.xml</extend>
+ <extend>${basedir}/../../common-project.xml</extend>
- <groupId>avalon-finder</groupId>
+ <groupId>&avalon-finder-id;</groupId>
<id>avalon-finder-test</id>
<name>Avalon Finder Test</name>
@@ -16,9 +19,9 @@
<!-- implementation dependencies -->
<dependency>
- <groupId>avalon-finder</groupId>
- <artifactId>avalon-finder-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-finder-id;</groupId>
+ <artifactId>&avalon-finder-api-id;</artifactId>
+ <version>&avalon-finder-api-version;</version>
</dependency>
<dependency>
@@ -37,9 +40,9 @@
<!-- test dependencies -->
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-unit</artifactId>
- <version>3.3.0</version>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-unit-id;</artifactId>
+ <version>&merlin-unit-version;</version>
</dependency>
</dependencies>
1.1 avalon-components/facilities/finder/test/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-entities SYSTEM "file:../../../../avalon/merlin/version.ent"> %merlin-entities;
<!ENTITY % facility-entities SYSTEM "file:../../version.ent"> %facility-entities;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
Re: cvs commit: avalon-components/facilities/finder/test index.ent
maven.xml project.xml
Posted by Stephen McConnell <mc...@apache.org>.
Niclas Hedhman wrote:
> On Tuesday 06 April 2004 10:17, Stephen McConnell wrote:
>
>>Its worth thinking about.
>>Have you tried anything along these lines?
>
>
> There are other options;
>
> 1. Replicate the file across the various CVS repos.
> 2. Wait until SVN is in place and everything is under one umbrella, and things
> can be cross referenced more easily.
> 3. Do a CVS checkout of the file from a known location, as part of the build
> process.
>
My preference for the moment is to go with (1).
Steve.
>
> Niclas
--
|------------------------------------------------|
| Magic by Merlin |
| Production by Avalon |
| |
| http://avalon.apache.org/merlin |
| http://dpml.net/merlin/distributions/latest |
|------------------------------------------------|
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon-components/facilities/finder/test index.ent maven.xml project.xml
Posted by Niclas Hedhman <ni...@hedhman.org>.
On Tuesday 06 April 2004 10:17, Stephen McConnell wrote:
> Its worth thinking about.
> Have you tried anything along these lines?
There are other options;
1. Replicate the file across the various CVS repos.
2. Wait until SVN is in place and everything is under one umbrella, and things
can be cross referenced more easily.
3. Do a CVS checkout of the file from a known location, as part of the build
process.
Niclas
--
+---------//-------------------+
| http://www.bali.ac |
| http://niclas.hedhman.org |
+------//----------------------+
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon-components/facilities/finder/test index.ent
maven.xml project.xml
Posted by Stephen McConnell <mc...@apache.org>.
Niclas Hedhman wrote:
> On Tuesday 06 April 2004 02:36, mcconnell@apache.org wrote:
>
>> <!ENTITY % merlin-entities SYSTEM
>>"file:../../../../avalon/merlin/version.ent"> %merlin-entities; <!ENTITY %
>>facility-entities SYSTEM "file:../../version.ent"> %facility-entities;
>
>
> IMHO, this doesn't cut it.
>
> It is 'against convention' that CVS modules are not compilable 'stand-alone'.
Thinking the same thing. But at the same time I wanted to get some hooks
in so we could see what its like.
> Can't the "version.ent" be a Maven artifact by itself that each part depends
> on??
Its worth thinking about.
Have you tried anything along these lines?
Stephen.
> Niclas
--
|------------------------------------------------|
| Magic by Merlin |
| Production by Avalon |
| |
| http://avalon.apache.org/merlin |
| http://dpml.net/merlin/distributions/latest |
|------------------------------------------------|
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon-components/facilities/finder/test index.ent maven.xml project.xml
Posted by Niclas Hedhman <ni...@hedhman.org>.
On Tuesday 06 April 2004 02:36, mcconnell@apache.org wrote:
> <!ENTITY % merlin-entities SYSTEM
> "file:../../../../avalon/merlin/version.ent"> %merlin-entities; <!ENTITY %
> facility-entities SYSTEM "file:../../version.ent"> %facility-entities;
IMHO, this doesn't cut it.
It is 'against convention' that CVS modules are not compilable 'stand-alone'.
Can't the "version.ent" be a Maven artifact by itself that each part depends
on??
Niclas
--
+---------//-------------------+
| http://www.bali.ac |
| http://niclas.hedhman.org |
+------//----------------------+
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org