mcconnell 2004/04/05 04:57:14
Modified: template master.xml project.xml
template/api project.xml
template/impl maven.xml project.xml
template/impl/conf block.xml
Added: template .cvsignore index.ent version.ent
template/api .cvsignore index.ent
template/impl .cvsignore index.ent
Log:
Playing around with entities.
Revision Changes Path
1.2 +48 -0 avalon-sandbox/template/master.xml
Index: master.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/template/master.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- master.xml 20 Dec 2003 01:05:54 -0000 1.1
+++ master.xml 5 Apr 2004 11:57:14 -0000 1.2
@@ -55,4 +55,52 @@
</developer>
</developers>
+ <build>
+
+ <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*TestCase.*</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.*</exclude>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.x*</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.x*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${basedir}/conf</directory>
+ <targetPath>BLOCK-INF</targetPath>
+ <includes>
+ <include>block.xml</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <jars></jars>
+ </build>
+
+
</project>
1.3 +0 -46 avalon-sandbox/template/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/template/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 20 Dec 2003 02:11:55 -0000 1.2
+++ project.xml 5 Apr 2004 11:57:14 -0000 1.3
@@ -20,50 +20,4 @@
</packageGroup>
</packageGroups>
- <build>
-
- <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*TestCase.*</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.*</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- <include>**/*.x*</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- <include>**/*.x*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/conf</directory>
- <targetPath>BLOCK-INF</targetPath>
- <includes>
- <include>block.xml</include>
- </includes>
- </resource>
- </resources>
-
- <jars></jars>
- </build>
-
</project>
1.1 avalon-sandbox/template/.cvsignore
Index: .cvsignore
===================================================================
target
*.log
1.1 avalon-sandbox/template/index.ent
Index: index.ent
===================================================================
<!ENTITY template-api "0.1.0">
<!ENTITY % version-entities SYSTEM "file:version.ent"> %version-entities;
<!ENTITY % merlin-entities SYSTEM "file:../../avalon/merlin/version.ent">
%merlin-entities;
1.1 avalon-sandbox/template/version.ent
Index: version.ent
===================================================================
<!ENTITY template-id "template">
<!ENTITY template-api-id "template-api">
<!ENTITY template-api-version "0.1.0">
<!ENTITY template-impl-id "template-impl">
<!ENTITY template-impl-version "0.1.0">
1.2 +8 -3 avalon-sandbox/template/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/template/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Dec 2003 01:05:55 -0000 1.1
+++ project.xml 5 Apr 2004 11:57:14 -0000 1.2
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../master.xml</extend>
+
+ <id>&template-api-id;</id>
+ <groupId>&template-id;</groupId>
+ <currentVersion>&template-api-version;</currentVersion>
- <id>template-api</id>
<name>Template API</name>
<package>org.apache.avalon.playground</package>
- <currentVersion>1.0</currentVersion>
<shortDescription>Template API</shortDescription>
</project>
1.1 avalon-sandbox/template/api/.cvsignore
Index: .cvsignore
===================================================================
target
*.log
1.1 avalon-sandbox/template/api/index.ent
Index: index.ent
===================================================================
<!ENTITY template-api "0.1.0">
<!ENTITY % version-entities SYSTEM "file:../version.ent"> %version-entities;
1.2 +9 -1 avalon-sandbox/template/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/template/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 20 Dec 2003 01:05:55 -0000 1.1
+++ maven.xml 5 Apr 2004 11:57:14 -0000 1.2
@@ -1,7 +1,15 @@
-<project default="jar:install">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+<project default="jar:install" xmlns:ant="jelly:ant">
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
+ </preGoal>
+
+ <preGoal name="java:jar-resources">
+ <ant:filter token="TEMPLATE-API-VERSION" value="&template-api-version;"/>
</preGoal>
</project>
1.4 +17 -12 avalon-sandbox/template/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/template/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 1 Jan 2004 16:43:38 -0000 1.3
+++ project.xml 5 Apr 2004 11:57:14 -0000 1.4
@@ -1,33 +1,38 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../master.xml</extend>
+
+ <id>&template-impl-id;</id>
+ <groupId>&template-id;</groupId>
+ <currentVersion>&template-impl-version;</currentVersion>
- <id>template-impl</id>
<name>Template Implementation</name>
- <currentVersion>1.0</currentVersion>
<shortDescription>Template Implementation</shortDescription>
<package>org.apache.avalon.playground.impl</package>
<dependencies>
<dependency>
- <groupId>template</groupId>
- <artifactId>template-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-unit</artifactId>
- <version>3.2.7</version>
+ <groupId>&template-id;</groupId>
+ <artifactId>&template-api-id;</artifactId>
+ <version>&template-api-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-unit-id;</artifactId>
+ <version>&merlin-unit-version;</version>
</dependency>
</dependencies>
1.1 avalon-sandbox/template/impl/.cvsignore
Index: .cvsignore
===================================================================
target
*.log
1.1 avalon-sandbox/template/impl/index.ent
Index: index.ent
===================================================================
<!ENTITY % template-entities SYSTEM "file:../version.ent"> %template-entities;
<!ENTITY % merlin-entities SYSTEM "file:../../../avalon/merlin/version.ent">
%merlin-entities;
1.3 +1 -1 avalon-sandbox/template/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/template/impl/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 20 Dec 2003 23:36:59 -0000 1.2
+++ block.xml 5 Apr 2004 11:57:14 -0000 1.3
@@ -6,7 +6,7 @@
<classloader>
<classpath>
<repository>
- <resource id="template:template-api" version="1.0"/>
+ <resource id="template:template-api"
version="@TEMPLATE-API-VERSION@"/>
</repository>
</classpath>
</classloader>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
