mcconnell 2003/07/01 07:12:46
Modified: merlin/assembly project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
DefaultClasspath.java EngineClassLoader.java
merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model
IncludeDescriptor.java
merlin/merlin-core 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-plugin project.xml
merlin/meta project.xml
merlin/meta-tools project.xml
Log:
Update to an enhanced version of excalibur-configuration that supports
externalization of a configuration as XML source to a buffer.
Revision Changes Path
1.11 +1 -1 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 23 Jun 2003 02:37:49 -0000 1.10
+++ project.xml 1 Jul 2003 14:12:44 -0000 1.11
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
1.2 +2 -2
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultClasspath.java
Index: DefaultClasspath.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultClasspath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultClasspath.java 29 Apr 2003 14:24:37 -0000 1.1
+++ DefaultClasspath.java 1 Jul 2003 14:12:44 -0000 1.2
@@ -162,7 +162,7 @@
IncludeDescriptor[] includes = descriptor.getIncludeDescriptors();
for( int j = 0; j < includes.length; j++ )
{
- String inc = includes[j].getFile();
+ String inc = includes[j].getPath();
try
{
URL url = new File( anchor, inc ).getCanonicalFile().toURL();
1.12 +2 -2
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java
Index: EngineClassLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EngineClassLoader.java 27 Jun 2003 22:52:11 -0000 1.11
+++ EngineClassLoader.java 1 Jul 2003 14:12:44 -0000 1.12
@@ -451,7 +451,7 @@
{
File include =
new File( anchor,
- includes[j].getFile() ).getCanonicalFile();
+ includes[j].getPath() ).getCanonicalFile();
if( include.isDirectory() )
{
list.add( include );
1.3 +2 -2
avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/IncludeDescriptor.java
Index: IncludeDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/IncludeDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncludeDescriptor.java 11 Apr 2003 20:28:32 -0000 1.2
+++ IncludeDescriptor.java 1 Jul 2003 14:12:45 -0000 1.3
@@ -96,7 +96,7 @@
*
* @return the file
*/
- public String getFile()
+ public String getPath()
{
return m_file;
}
1.11 +1 -1 avalon-sandbox/merlin/merlin-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 24 Jun 2003 07:19:34 -0000 1.10
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.11
@@ -96,7 +96,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.6 +1 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 25 Jun 2003 04:11:15 -0000 1.5
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.6
@@ -138,7 +138,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 24 Jun 2003 07:28:53 -0000 1.5
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.6
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
1.5 +1 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 24 Jun 2003 13:36:09 -0000 1.4
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.5
@@ -102,7 +102,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.5 +1 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 24 Jun 2003 13:36:10 -0000 1.4
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.5
@@ -158,7 +158,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 23 Jun 2003 02:37:49 -0000 1.6
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.7
@@ -89,7 +89,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.6 +1 -1 avalon-sandbox/merlin/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 20 Jun 2003 05:25:27 -0000 1.5
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.6
@@ -42,7 +42,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.5 +1 -1 avalon-sandbox/merlin/meta-tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 20 Jun 2003 05:25:27 -0000 1.4
+++ project.xml 1 Jul 2003 14:12:45 -0000 1.5
@@ -40,7 +40,7 @@
<dependency>
<id>excalibur-configuration</id>
- <version>1.0</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
