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 2003/01/24 00:11:41 UTC
cvs commit: jakarta-avalon-cornerstone threads.xml sockets.xml scheduler.xml masterstore.xml datasources.xml connection.xml
mcconnell 2003/01/23 15:11:41
Modified: . threads.xml sockets.xml scheduler.xml
masterstore.xml datasources.xml connection.xml
Log:
Updates to resolve Phoenix conflict on extensions declarations.
Revision Changes Path
1.2 +10 -1 jakarta-avalon-cornerstone/threads.xml
Index: threads.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/threads.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threads.xml 15 Jan 2003 12:27:31 -0000 1.1
+++ threads.xml 23 Jan 2003 23:11:40 -0000 1.2
@@ -64,6 +64,7 @@
<jar jarfile="${build.lib}/${name}-${package-version}.jar"
basedir="${build.classes}">
+ <!--
<manifest>
<attribute name="Extension-Name" value="${extension.name}"/>
@@ -72,12 +73,20 @@
<attribute name="Implementation-Vendor" value="${vendor}"/>
<attribute name="Implementation-Version" value="${package-version}"/>
- <attribute name="Extension-List" value="framework thread threadcontext"/>
+ <attribute name="Extension-List" value="framework context thread"/>
<attribute name="framework-Extension-Name" value="${avalon-framework.extension.name}"/>
<attribute name="framework-Specification-Version" value="${avalon-framework.extension.version}"/>
<attribute name="framework-Implementation-Version" value="${avalon-framework.extension.implementation}"/>
+ <attribute name="context-Extension-Name" value="${excalibur-threadcontext.ext.name}"/>
+ <attribute name="context-Specification-Version" value="${excalibur-threadcontext.ext.version}"/>
+
+ <attribute name="thread-Extension-Name" value="${excalibur-thread.ext.name}"/>
+ <attribute name="thread-Specification-Version" value="${excalibur-thread.ext.version}"/>
+ <attribute name="thread-Implementation-Version" value="${excalibur-thread.ext.impl}"/>
+
</manifest>
+ -->
<include name="org/apache/avalon/cornerstone/blocks/${ant.project.name}/**"/>
<include name="org/apache/avalon/cornerstone/services/${ant.project.name}/**"/>
1.2 +2 -0 jakarta-avalon-cornerstone/sockets.xml
Index: sockets.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/sockets.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sockets.xml 15 Jan 2003 12:27:31 -0000 1.1
+++ sockets.xml 23 Jan 2003 23:11:40 -0000 1.2
@@ -62,6 +62,7 @@
<jar jarfile="${build.lib}/${name}-${package-version}.jar"
basedir="${build.classes}">
+ <!--
<manifest>
<attribute name="Extension-Name" value="${extension.name}"/>
@@ -76,6 +77,7 @@
<attribute name="framework-Implementation-Version" value="${avalon-framework.extension.implementation}"/>
</manifest>
+ -->
<include name="org/apache/avalon/cornerstone/blocks/${ant.project.name}/**"/>
<include name="org/apache/avalon/cornerstone/services/${ant.project.name}/**"/>
1.2 +2 -0 jakarta-avalon-cornerstone/scheduler.xml
Index: scheduler.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/scheduler.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scheduler.xml 15 Jan 2003 12:27:31 -0000 1.1
+++ scheduler.xml 23 Jan 2003 23:11:40 -0000 1.2
@@ -64,6 +64,7 @@
<jar jarfile="${build.lib}/${name}-${package-version}.jar"
basedir="${build.classes}">
+ <!--
<manifest>
<attribute name="Extension-Name" value="${extension.name}"/>
@@ -82,6 +83,7 @@
<attribute name="threads-Implementation-Version" value="${cornerstone-threads.ext.impl}"/>
</manifest>
+ -->
<include name="org/apache/avalon/cornerstone/blocks/${ant.project.name}/**"/>
<include name="org/apache/avalon/cornerstone/services/${ant.project.name}/**"/>
1.2 +2 -0 jakarta-avalon-cornerstone/masterstore.xml
Index: masterstore.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/masterstore.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- masterstore.xml 15 Jan 2003 12:27:31 -0000 1.1
+++ masterstore.xml 23 Jan 2003 23:11:40 -0000 1.2
@@ -64,6 +64,7 @@
<jar jarfile="${build.lib}/${name}-${package-version}.jar"
basedir="${build.classes}">
+ <!--
<manifest>
<attribute name="Extension-Name" value="${extension.name}"/>
@@ -78,6 +79,7 @@
<attribute name="framework-Implementation-Version" value="${avalon-framework.extension.implementation}"/>
</manifest>
+ -->
<include name="org/apache/avalon/cornerstone/blocks/${ant.project.name}/**"/>
<include name="org/apache/avalon/cornerstone/services/store/**"/>
1.2 +10 -4 jakarta-avalon-cornerstone/datasources.xml
Index: datasources.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/datasources.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- datasources.xml 17 Jan 2003 06:20:05 -0000 1.1
+++ datasources.xml 23 Jan 2003 23:11:40 -0000 1.2
@@ -37,6 +37,7 @@
<classpath refid="project.class.path" />
<src path="${java.dir}"/>
<include name="**/${ant.project.name}/**.*"/>
+ <include name="**/datasource/*.java"/>
</javac>
</target>
@@ -50,6 +51,7 @@
<generatemeta dest="${build.gen}">
<fileset dir="${java.dir}">
<include name="**/${ant.project.name}/*.java"/>
+ <include name="**/datasource/*.java"/>
</fileset>
</generatemeta>
@@ -64,6 +66,7 @@
<jar jarfile="${build.lib}/${name}-${package-version}.jar"
basedir="${build.classes}">
+ <!--
<manifest>
<attribute name="Extension-Name" value="${extension.name}"/>
@@ -78,17 +81,20 @@
<attribute name="framework-Implementation-Version" value="${avalon-framework.extension.implementation}"/>
</manifest>
+ -->
<include name="org/apache/avalon/cornerstone/blocks/${ant.project.name}/**"/>
<include name="org/apache/avalon/cornerstone/services/${ant.project.name}/**"/>
+ <include name="org/apache/avalon/cornerstone/blocks/datasource/**"/>
+ <include name="org/apache/avalon/cornerstone/services/datasource/**"/>
<fileset dir="${build.gen}">
- <include name="**/${ant.project.name}/**/*.xinfo"/>
- <include name="**${ant.project.name}/**/*.mxinfo"/>
+ <include name="**/datasource*/**/*.xinfo"/>
+ <include name="**/datasource*/**/*.mxinfo"/>
</fileset>
<fileset dir="${src.dir}/java">
- <include name="**/${ant.project.name}/**/*-schema.xml"/>
- <include name="**/${ant.project.name}/**/*.xconfig"/>
+ <include name="**/datasource*/**/*.*-schema.xml"/>
+ <include name="**/datasource*/**/*.xconfig"/>
</fileset>
</jar>
1.2 +2 -0 jakarta-avalon-cornerstone/connection.xml
Index: connection.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/connection.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- connection.xml 15 Jan 2003 12:27:31 -0000 1.1
+++ connection.xml 23 Jan 2003 23:11:40 -0000 1.2
@@ -65,6 +65,7 @@
<jar jarfile="${build.lib}/${name}-${package-version}.jar"
basedir="${build.classes}">
+ <!--
<manifest>
<attribute name="Extension-Name" value="${extension.name}"/>
@@ -83,6 +84,7 @@
<attribute name="threads-Implementation-Version" value="${cornerstone-threads.ext.impl}"/>
</manifest>
+ -->
<include name="org/apache/avalon/cornerstone/blocks/${ant.project.name}/**"/>
<include name="org/apache/avalon/cornerstone/services/${ant.project.name}/**"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>