mcconnell 2003/08/21 12:37:43
Modified: merlin maven.xml
merlin/activation project.xml
merlin/composition project.xml
merlin/composition/src/java/org/apache/avalon/composition/data/builder
ContainmentProfileBuilder.java
merlin/extension project.xml
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl project.xml
merlin/merlin-extensions/merlin-servlet project.xml
merlin/merlin-platform project.xml
merlin/merlin-platform/examples/afs/simple project.xml
merlin/merlin-platform/examples/afs/simple-servlet
project.xml
merlin/merlin-platform/examples/james project.xml
merlin/merlin-platform/src/config kernel.xml
merlin/merlin-plugin project.xml
merlin/repository/impl project.xml
Log:
Updgrade to current xml-apis and xerces releases.
Revision Changes Path
1.42 +8 -5 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- maven.xml 21 Aug 2003 00:52:46 -0000 1.41
+++ maven.xml 21 Aug 2003 19:37:42 -0000 1.42
@@ -61,11 +61,14 @@
will included in the JVM bootstrap process.
-->
<ant:copy
- file="${merlin.build.inst.dir}/repository/xml-apis/jars/xml-apis-1.0.b2.jar"
+ file="${merlin.build.inst.dir}/repository/xml-apis/jars/xml-apis-2.0.2.jar"
+ toDir="${merlin.build.inst.dir}/ext"/>
+ <ant:copy
+
file="${merlin.build.inst.dir}/repository/xml-apis/jars/xmlParserAPIs-2.0.2.jar"
toDir="${merlin.build.inst.dir}/ext"/>
<delete dir="${merlin.build.inst.dir}/repository/xml-apis"/>
<ant:copy
- file="${merlin.build.inst.dir}/repository/xerces/jars/xerces-2.2.1.jar"
+ file="${merlin.build.inst.dir}/repository/xerces/jars/xerces-2.4.0.jar"
toDir="${merlin.build.inst.dir}/ext"/>
<delete dir="${merlin.build.inst.dir}/repository/xerces"/>
@@ -94,14 +97,14 @@
</goal>
- <goal name="merlin-package">
+ <goal name="package">
<attainGoal name="merlin-clean"/>
<attainGoal name="merlin-dist"/>
<attainGoal name="merlin-site"/>
- <attainGoal name="package"/>
+ <attainGoal name="merlin-package"/>
</goal>
- <goal name="package">
+ <goal name="merlin-package">
<maven:snapshot project="${pom}"/>
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
<j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
1.6 +7 -5 avalon-sandbox/merlin/activation/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 21 Aug 2003 00:52:47 -0000 1.5
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.6
@@ -136,14 +136,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
</dependencies>
1.9 +7 -5 avalon-sandbox/merlin/composition/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 21 Aug 2003 00:52:47 -0000 1.8
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.9
@@ -120,14 +120,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
</dependencies>
1.3 +11 -3
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java
Index: ContainmentProfileBuilder.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainmentProfileBuilder.java 31 Jul 2003 17:42:38 -0000 1.2
+++ ContainmentProfileBuilder.java 21 Aug 2003 19:37:42 -0000 1.3
@@ -93,12 +93,17 @@
* @return the containment profile
* @exception Exception if a error occurs during profile creation
*/
- public ContainmentProfile createContainmentProfile( InputStream inputStream )
+ public ContainmentProfile createContainmentProfile( InputStream inputStream )
throws Exception
{
+ byte[] buffer = new byte[1024*32];
+ int read = inputStream.read( buffer );
+ inputStream = new ByteArrayInputStream(buffer, 0, read );
+
try
{
- final ContainmentProfile profile = buildFromSerDescriptor( inputStream);
+ final ContainmentProfile profile =
+ buildFromSerDescriptor( inputStream);
if( null != profile )
{
return profile;
@@ -112,6 +117,9 @@
// and see if we can resolve the source as an XML input but
// sooner or later we will need to update the serialized
// to return null if the source isn' a serialized source
+
+ inputStream = new ByteArrayInputStream( buffer, 0, read );
+
}
return buildFromXMLDescriptor( inputStream );
1.6 +7 -5 avalon-sandbox/merlin/extension/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/extension/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 11 Aug 2003 22:58:50 -0000 1.5
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.6
@@ -30,14 +30,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
</dependencies>
1.8 +13 -15 avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin.properties 20 Aug 2003 11:57:13 -0000 1.7
+++ merlin.properties 21 Aug 2003 19:37:42 -0000 1.8
@@ -27,18 +27,16 @@
#
# the bootstrap classpath
#
-merlin.impl.classpath.length=14
-merlin.impl.classpath.0=xerces:xerces;2.2.1
-merlin.impl.classpath.1=xml-apis:xml-apis;1.0.b2
-merlin.impl.classpath.2=avalon-framework:avalon-framework-impl;SNAPSHOT
-merlin.impl.classpath.3=avalon-meta:avalon-meta-impl;SNAPSHOT
-merlin.impl.classpath.4=avalon-extension:avalon-extension-impl;SNAPSHOT
-merlin.impl.classpath.5=avalon-composition:avalon-composition-impl;SNAPSHOT
-merlin.impl.classpath.6=avalon-activation:avalon-activation-impl;SNAPSHOT
-merlin.impl.classpath.7=excalibur-i18n:excalibur-i18n;1.0
-merlin.impl.classpath.8=avalon-repository:avalon-repository-impl;SNAPSHOT
-merlin.impl.classpath.9=commons-cli:commons-cli;1.0
-merlin.impl.classpath.10=merlin:merlin-kernel-impl;SNAPSHOT
-merlin.impl.classpath.11=logkit:logkit;1.2
-merlin.impl.classpath.12=excalibur-event:excalibur-event;1.0.3
-merlin.impl.classpath.13=excalibur-configuration:excalibur-configuration;1.1-dev
+merlin.impl.classpath.length=12
+merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;SNAPSHOT
+merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;SNAPSHOT
+merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;SNAPSHOT
+merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;SNAPSHOT
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;SNAPSHOT
+merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.0
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;SNAPSHOT
+merlin.impl.classpath.7=commons-cli:commons-cli;1.0
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;SNAPSHOT
+merlin.impl.classpath.9=logkit:logkit;1.2
+merlin.impl.classpath.10=excalibur-event:excalibur-event;1.0.3
+merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1-dev
1.3 +7 -5 avalon-sandbox/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 19 Aug 2003 03:51:23 -0000 1.2
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.3
@@ -161,14 +161,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
</dependencies>
1.11 +21 -11
avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 21 Aug 2003 00:52:47 -0000 1.10
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.11
@@ -50,14 +50,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
<dependency>
@@ -111,16 +113,24 @@
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-assembly-spi</artifactId>
+ <groupId>avalon-activation</groupId>
+ <artifactId>avalon-activation-api</artifactId>
+ <version>SNAPSHOT</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>avalon-activation</groupId>
+ <artifactId>avalon-activation-spi</artifactId>
<version>SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-assembly</artifactId>
+ <groupId>avalon-activation</groupId>
+ <artifactId>avalon-activation-impl</artifactId>
<version>SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -187,7 +197,7 @@
<dependency>
<groupId>merlin</groupId>
- <artifactId>merlin-spi</artifactId>
+ <artifactId>merlin-kernel-spi</artifactId>
<version>SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
@@ -196,7 +206,7 @@
<dependency>
<groupId>merlin</groupId>
- <artifactId>merlin-core</artifactId>
+ <artifactId>merlin-kernel-impl</artifactId>
<version>SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
1.20 +6 -7 avalon-sandbox/merlin/merlin-platform/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 21 Aug 2003 00:52:47 -0000 1.19
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.20
@@ -156,17 +156,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
</dependency>
<dependency>
- <id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
- <id>xalan</id>
- <version>2.3.1</version>
+ <id>xerces</id>
+ <version>2.4.0</version>
</dependency>
</dependencies>
1.6 +7 -5
avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 1 Jul 2003 14:12:45 -0000 1.5
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.6
@@ -38,14 +38,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
<!-- unit test -->
1.6 +7 -5
avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 1 Jul 2003 14:12:45 -0000 1.5
+++ project.xml 21 Aug 2003 19:37:42 -0000 1.6
@@ -67,14 +67,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
<!-- unit test -->
1.3 +7 -4 avalon-sandbox/merlin/merlin-platform/examples/james/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 31 Jul 2003 18:56:05 -0000 1.2
+++ project.xml 21 Aug 2003 19:37:43 -0000 1.3
@@ -143,13 +143,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
</dependencies>
1.8 +11 -1 avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kernel.xml 20 Aug 2003 11:59:43 -0000 1.7
+++ kernel.xml 21 Aug 2003 19:37:43 -0000 1.8
@@ -13,8 +13,18 @@
</target>
</logging>
+ <repository>
+ <hosts>
+ <host>http://www.ibiblio.org/maven/</host>
+ </hosts>
+ </repository>
+
<container name="root">
- <!-- add components, container or includes here -->
+ <!--
+ Add components, container or includes here.
+ These resources will be available to any blocks included
+ during deployment from command line or script arguments.
+ -->
</container>
</kernel>
1.16 +7 -5 avalon-sandbox/merlin/merlin-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 19 Aug 2003 05:45:15 -0000 1.15
+++ project.xml 21 Aug 2003 19:37:43 -0000 1.16
@@ -164,14 +164,16 @@
<dependency>
<id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
-
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
+ <version>2.4.0</version>
</dependency>
<!-- xdoclet -->
1.3 +1 -3 avalon-sandbox/merlin/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/repository/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 21 Aug 2003 00:52:47 -0000 1.2
+++ project.xml 21 Aug 2003 19:37:43 -0000 1.3
@@ -11,9 +11,7 @@
<currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
- <shortDescription>
-Jar file repository implementation.
- </shortDescription>
+ <shortDescription>Jar file repository implementation.</shortDescription>
<dependencies>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
