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/06/20 21:02:18 UTC
cvs commit: avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder TypeBuilder.java XMLTypeCreator.java
mcconnell 2003/06/20 12:02:18
Modified: merlin project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
DefaultAppliance.java
merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
DefaultTypeRepository.java
merlin/merlin-plugin plugin.jelly
merlin/meta/src/java/org/apache/avalon/meta/info/builder
TypeBuilder.java XMLTypeCreator.java
Log:
Fix a bug in the plugin (updated to properly reference the framework api and impl jars).
Revision Changes Path
1.16 +7 -0 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 18 Jun 2003 11:37:12 -0000 1.15
+++ project.xml 20 Jun 2003 19:02:17 -0000 1.16
@@ -224,6 +224,13 @@
<include>LICENSE.txt</include>
</includes>
</resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <targetPath>BLOCK-INF</targetPath>
+ <includes>
+ <include>block.xml</include>
+ </includes>
+ </resource>
</resources>
<jars></jars>
1.14 +2 -1 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultAppliance.java 19 Jun 2003 11:21:19 -0000 1.13
+++ DefaultAppliance.java 20 Jun 2003 19:02:17 -0000 1.14
@@ -1095,6 +1095,7 @@
{
DependencyDescriptor dependency = dependencies[i];
String role = dependency.getKey();
+
if( getServiceProvider( role ) == null )
{
1.4 +3 -2 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultTypeRepository.java
Index: DefaultTypeRepository.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultTypeRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTypeRepository.java 15 Jun 2003 18:22:30 -0000 1.3
+++ DefaultTypeRepository.java 20 Jun 2003 19:02:17 -0000 1.4
@@ -162,7 +162,8 @@
try
{
return DEFAULT_BUILDER.build( clazz.getName(), clazz.getClassLoader() );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error =
"Could not register a type relative to the path: "
1.12 +2 -1 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 16 Jun 2003 08:34:39 -0000 1.11
+++ plugin.jelly 20 Jun 2003 19:02:17 -0000 1.12
@@ -18,7 +18,8 @@
<taskdef name="meta" classname="org.apache.avalon.meta.tools.ant.MetaTask">
<classpath>
<pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
- <pathelement path="${plugin.getDependencyPath('avalon-framework:avalon-framework')}"/>
+ <pathelement path="${plugin.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
+ <pathelement path="${plugin.getDependencyPath('avalon-framework:avalon-framework-impl')}"/>
<pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-tools')}"/>
<pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-spi')}"/>
<pathelement path="${plugin.getDependencyPath('avalon:avalon-meta')}"/>
1.6 +4 -2 avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
Index: TypeBuilder.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TypeBuilder.java 12 Jun 2003 08:18:51 -0000 1.5
+++ TypeBuilder.java 20 Jun 2003 19:02:18 -0000 1.6
@@ -58,6 +58,7 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.meta.ConfigurationBuilder;
+import org.apache.excalibur.configuration.ConfigurationUtil;
import org.xml.sax.InputSource;
/**
@@ -198,7 +199,8 @@
if( defaultsStream != null )
{
final InputSource defaultsSource = new InputSource( defaultsStream );
- defaults = resolveConfiguration( classLoader, ConfigurationBuilder.build( defaultsSource ) );
+ defaults = resolveConfiguration(
+ classLoader, ConfigurationBuilder.build( defaultsSource ) );
}
else
{
1.7 +3 -1 avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLTypeCreator.java 24 Apr 2003 12:43:31 -0000 1.6
+++ XMLTypeCreator.java 20 Jun 2003 19:02:18 -0000 1.7
@@ -70,6 +70,7 @@
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
+import org.apache.excalibur.configuration.ConfigurationUtil;
import org.xml.sax.InputSource;
/**
@@ -465,6 +466,7 @@
type = path;
version = buildVersion( "1.0.0" );
}
+
return new ReferenceDescriptor( type, version );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org