avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource DeploymentHelper.java
Date Mon, 18 Nov 2002 11:33:46 GMT
mcconnell    2002/11/18 03:33:46

  Modified:    assembly build.xml
               assembly/src/java/org/apache/excalibur/assembly/type
                        DefaultTypeManager.java
               assembly/src/java/org/apache/excalibur/merlin/assembly
                        ContainerManager.java TypeRegistry.java
               assembly/src/java/org/apache/excalibur/merlin/model/builder
                        ContainerBuilder.java
               assembly/src/java/org/apache/excalibur/merlin/resource
                        DeploymentHelper.java
  Log:
  Updates to synchronize with excalibur/meta naming.
  
  Revision  Changes    Path
  1.73      +2 -2      jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- build.xml	18 Nov 2002 11:04:55 -0000	1.72
  +++ build.xml	18 Nov 2002 11:33:45 -0000	1.73
  @@ -317,8 +317,8 @@
   
     <target name="patch">
       <replace dir="src/java" summary="true"
  -       token="meta.model.Profile"
  -       value="merlin.model.Profile" >
  +       token="ComponentDescriptor"
  +       value="InfoDescriptor" >
        <include name="**/*.*"/>
       </replace>
     </target>
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/assembly/type/DefaultTypeManager.java
  
  Index: DefaultTypeManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/assembly/type/DefaultTypeManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultTypeManager.java	18 Nov 2002 10:57:21 -0000	1.1
  +++ DefaultTypeManager.java	18 Nov 2002 11:33:46 -0000	1.2
  @@ -326,7 +326,7 @@
               throw new NullPointerException( "type" );
           }
   
  -        final String classname = type.getInfo().getImplementationKey();
  +        final String classname = type.getInfo().getImplementationClassName();
   
           try
           {
  
  
  
  1.43      +4 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- ContainerManager.java	18 Nov 2002 10:52:53 -0000	1.42
  +++ ContainerManager.java	18 Nov 2002 11:33:46 -0000	1.43
  @@ -364,7 +364,7 @@
           for( int i = 0; i < types.length; i++ )
           {
               Type type = types[ i ];
  -            String classname = type.getInfo().getImplementationKey();
  +            String classname = type.getInfo().getImplementationClassName();
               Class clazz = loadClass( classname );
   
               Object[] profiles;
  @@ -680,7 +680,7 @@
       public void addProfile( Profile profile )
       {
           final String name = profile.getName();
  -        final String classname = profile.getType().getInfo().getImplementationKey();
  +        final String classname = profile.getType().getInfo().getImplementationClassName();
   
           getLocalLogger().debug( "adding: " + profile );
           final Profile existing = (Profile)m_profiles.get( name );
  @@ -1012,7 +1012,7 @@
               try
               {
                   if( Container.class.isAssignableFrom( 
  -                  loadClass( profile.getType().getInfo().getImplementationKey() ) ) )
  +                  loadClass( profile.getType().getInfo().getImplementationClassName() )
) )
                   {
                       res = new ContainerResource( this, (ContainerDescriptor) profile, c,
handler );
                   }
  
  
  
  1.20      +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java
  
  Index: TypeRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- TypeRegistry.java	23 Oct 2002 16:33:04 -0000	1.19
  +++ TypeRegistry.java	18 Nov 2002 11:33:46 -0000	1.20
  @@ -237,7 +237,7 @@
               throw new NullPointerException( "Illegal null component type argument." );
           }
   
  -        final String classname = type.getInfo().getImplementationKey();
  +        final String classname = type.getInfo().getImplementationClassName();
           try
           {
               return m_classloader.loadClass( classname );
  
  
  
  1.11      +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerBuilder.java
  
  Index: ContainerBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContainerBuilder.java	18 Nov 2002 10:52:54 -0000	1.10
  +++ ContainerBuilder.java	18 Nov 2002 11:33:46 -0000	1.11
  @@ -103,7 +103,7 @@
           throws Exception
       {
           final String xprofile =
  -            type.getInfo().getImplementationKey().replace( '.', '/' ) + ".xprofile";
  +            type.getInfo().getImplementationClassName().replace( '.', '/' ) + ".xprofile";
           final InputStream inputStream =
               loader.getResourceAsStream( xprofile );
   
  
  
  
  1.16      +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DeploymentHelper.java
  
  Index: DeploymentHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DeploymentHelper.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DeploymentHelper.java	18 Nov 2002 10:52:54 -0000	1.15
  +++ DeploymentHelper.java	18 Nov 2002 11:33:46 -0000	1.16
  @@ -162,7 +162,7 @@
           String classname = null;
           try
           {
  -            classname = profile.getType().getInfo().getImplementationKey();
  +            classname = profile.getType().getInfo().getImplementationClassName();
   
               getLogger().debug( "load profile: " + profile.getName()
                                  + "' in thread: '" + Thread.currentThread().getName()
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message