avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-sandbox .cvsignore
Date Tue, 08 Jul 2003 17:18:55 GMT
bloritsch    2003/07/08 10:18:55

  Modified:    cache/lib .cvsignore
               cscontainer AvalonContainer.build
               merlin/assembly/src/test/org/apache/avalon/assembly/engine/profile
                        ProfileRepositoryTestCase.java
               merlin/assembly/src/test/org/apache/avalon/assembly
                        TestBase.java
               merlin   .cvsignore
               .        .cvsignore
  Added:       csframework/src/cs cs.csproj
  Log:
  Fixup test
  
  Revision  Changes    Path
  1.2       +1 -0      avalon-sandbox/cache/lib/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/cache/lib/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	18 Mar 2003 13:49:33 -0000	1.1
  +++ .cvsignore	8 Jul 2003 17:18:54 -0000	1.2
  @@ -7,3 +7,4 @@
   velocity.log*
   *.el
   *.ipr
  +avalon-framework-4.1.4.jar
  
  
  
  1.3       +87 -87    avalon-sandbox/cscontainer/AvalonContainer.build
  
  Index: AvalonContainer.build
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/cscontainer/AvalonContainer.build,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AvalonContainer.build	25 Jun 2003 15:28:27 -0000	1.2
  +++ AvalonContainer.build	8 Jul 2003 17:18:54 -0000	1.3
  @@ -1,87 +1,87 @@
  -<project name="Avalon Framework - C#" default="build">
  -  <property name="name" value="AvalonContainer"/>
  -  <property name="version" value="1.0"/>
  -  <property name="library.name" value="${name}-${version}"/>
  -  <property name="build.debug" value="true"/>
  -  <property name="build.dir" value="build"/>
  -
  -  <target name="build" description="Build the AvalonContainer dll">
  -    <csc target="library"
  -         doc="${library.name}.xml"
  -         output="${library.name}.dll"
  -         debug="${build.debug}">
  -       <references basedir="bin">
  -         <includes name="*.dll"/>
  -       </references>
  -       <sources basedir="src/cs">
  -         <includes name="**.cs"/>
  -       </sources>
  -     </csc>
  -  </target>
  -
  -  <target name="build-test" depends="build">
  -    <csc target="library"
  -         output="${library.name}-test.dll"
  -         debug="${build.debug}">
  -       <references>
  -         <includes name="*.dll"/>
  -         <includes name="bin/*.dll"/>
  -         <includes name="${nant.location}/nunit.framework.dll"/>
  -       </references>
  -       <sources basedir="src/test">
  -         <includes name="**.cs"/>
  -       </sources>
  -     </csc>
  -  </target>
  -
  -  <target name="test" depends="build-test" description="Run the NUnit tests">
  -     <nunit2 haltonfailure="true">
  -       <test assemblyname="${library.name}-test.dll"/>
  -     </nunit2>
  -  </target>
  -
  -  <target name="ndocs" depends="build" description="Build the API documentation">
  -    <ndoc verbose="true">
  -      <assemblies>
  -        <includes name="${library.name}.dll"/>
  -      </assemblies>
  -      <summaries>
  -        <includes name="NamespaceSummary.xml"/>
  -      </summaries>
  -      <documenters>
  -        <documenter name="MSDN">
  -          <property name="OutputDirectory" value="doc\MSDN" />
  -          <property name="HtmlHelpName" value="AvalonFramework" />
  -          <property name="HtmlHelpCompilerFilename" value="hhc.exe" />
  -          <property name="IncludeFavorites" value="False" />
  -          <property name="Title" value="The Avalon Framework API Docs" />
  -          <property name="SplitTOCs" value="False" />
  -          <property name="DefaulTOC" value="" />
  -          <property name="ShowMissingSummaries" value="True" />
  -          <property name="ShowMissingRemarks" value="True" />
  -          <property name="ShowMissingParams" value="True" />
  -          <property name="ShowMissingReturns" value="True" />
  -          <property name="ShowMissingValues" value="True" />
  -          <property name="DocumentInternals" value="False" />
  -          <property name="DocumentProtected" value="True" />
  -          <property name="DocumentPrivates" value="False" />
  -          <property name="DocumentEmptyNamespaces" value="False" />
  -          <property name="IncludeAssemblyVersion" value="False" />
  -          <property name="CopyrightText" value="" />
  -          <property name="CopyrightHref" value="" />
  -        </documenter>
  -      </documenters> 
  -    </ndoc>
  -  </target>
  -
  -  <target name="clean" description="Clean up after ourselves">
  -    <delete>
  -      <fileset>
  -        <includes name="*.pdb"/>
  -        <includes name="*.dll"/>
  -        <includes name="*.xml"/>
  -        <includes name="doc"/>
  -      </fileset>
  -    </delete>
  -  </target>
  -</project>
  +<project name="Avalon Framework - C#" default="build">
  +  <property name="name" value="AvalonContainer"/>
  +  <property name="version" value="1.0"/>
  +  <property name="library.name" value="${name}-${version}"/>
  +  <property name="build.debug" value="true"/>
  +  <property name="build.dir" value="build"/>
  +
  +  <target name="build" description="Build the AvalonContainer dll">
  +    <csc target="library"
  +         doc="${library.name}.xml"
  +         output="${library.name}.dll"
  +         debug="${build.debug}">
  +       <references basedir="bin">
  +         <includes name="*.dll"/>
  +       </references>
  +       <sources basedir="src/cs">
  +         <includes name="**.cs"/>
  +       </sources>
  +     </csc>
  +  </target>
  +
  +  <target name="build-test" depends="build">
  +    <csc target="library"
  +         output="${library.name}-test.dll"
  +         debug="${build.debug}">
  +       <references>
  +         <includes name="*.dll"/>
  +         <includes name="bin/*.dll"/>
  +         <includes name="${nant.location}/nunit.framework.dll"/>
  +       </references>
  +       <sources basedir="src/test">
  +         <includes name="**.cs"/>
  +       </sources>
  +     </csc>
  +  </target>
  +
  +  <target name="test" depends="build-test" description="Run the NUnit tests">
  +     <nunit2 haltonfailure="true">
  +       <test assemblyname="${library.name}-test.dll"/>
  +     </nunit2>
  +  </target>
  +
  +  <target name="ndocs" depends="build" description="Build the API documentation">
  +    <ndoc verbose="true">
  +      <assemblies>
  +        <includes name="${library.name}.dll"/>
  +      </assemblies>
  +      <summaries>
  +        <includes name="src/cs/NamespaceSummary.xml"/>
  +      </summaries>
  +      <documenters>
  +        <documenter name="MSDN">
  +          <property name="OutputDirectory" value="doc\MSDN" />
  +          <property name="HtmlHelpName" value="AvalonFramework" />
  +          <property name="HtmlHelpCompilerFilename" value="hhc.exe" />
  +          <property name="IncludeFavorites" value="False" />
  +          <property name="Title" value="The Avalon Framework API Docs" />
  +          <property name="SplitTOCs" value="False" />
  +          <property name="DefaulTOC" value="" />
  +          <property name="ShowMissingSummaries" value="True" />
  +          <property name="ShowMissingRemarks" value="True" />
  +          <property name="ShowMissingParams" value="True" />
  +          <property name="ShowMissingReturns" value="True" />
  +          <property name="ShowMissingValues" value="True" />
  +          <property name="DocumentInternals" value="False" />
  +          <property name="DocumentProtected" value="True" />
  +          <property name="DocumentPrivates" value="False" />
  +          <property name="DocumentEmptyNamespaces" value="False" />
  +          <property name="IncludeAssemblyVersion" value="False" />
  +          <property name="CopyrightText" value="" />
  +          <property name="CopyrightHref" value="" />
  +        </documenter>
  +      </documenters> 
  +    </ndoc>
  +  </target>
  +
  +  <target name="clean" description="Clean up after ourselves">
  +    <delete>
  +      <fileset>
  +        <includes name="*.pdb"/>
  +        <includes name="*.dll"/>
  +        <includes name="*.xml"/>
  +        <includes name="doc"/>
  +      </fileset>
  +    </delete>
  +  </target>
  +</project>
  
  
  
  1.1                  avalon-sandbox/csframework/src/cs/cs.csproj
  
  Index: cs.csproj
  ===================================================================
  <VisualStudioProject>
      <CSHARP
          ProjectType = "Local"
          ProductVersion = "7.10.3077"
          SchemaVersion = "2.0"
          ProjectGuid = "{C9D1D4DB-C3DF-4230-8ECE-9C253D09B369}"
      >
          <Build>
              <Settings
                  ApplicationIcon = ""
                  AssemblyKeyContainerName = ""
                  AssemblyName = "cs"
                  AssemblyOriginatorKeyFile = ""
                  DefaultClientScript = "JScript"
                  DefaultHTMLPageLayout = "Grid"
                  DefaultTargetSchema = "IE50"
                  DelaySign = "false"
                  OutputType = "Exe"
                  PreBuildEvent = ""
                  PostBuildEvent = ""
                  RootNamespace = "cs"
                  RunPostBuildEvent = "OnBuildSuccess"
                  StartupObject = ""
              >
                  <Config
                      Name = "Debug"
                      AllowUnsafeBlocks = "false"
                      BaseAddress = "285212672"
                      CheckForOverflowUnderflow = "false"
                      ConfigurationOverrideFile = ""
                      DefineConstants = ""
                      DocumentationFile = ""
                      DebugSymbols = "true"
                      FileAlignment = "4096"
                      IncrementalBuild = "false"
                      NoStdLib = "false"
                      NoWarn = ""
                      Optimize = "false"
                      OutputPath = "bin\Debug\"
                      RegisterForComInterop = "false"
                      RemoveIntegerChecks = "false"
                      TreatWarningsAsErrors = "false"
                      WarningLevel = "1"
                  />
                  <Config
                      Name = "Release"
                      AllowUnsafeBlocks = "false"
                      BaseAddress = "285212672"
                      CheckForOverflowUnderflow = "false"
                      ConfigurationOverrideFile = ""
                      DefineConstants = ""
                      DocumentationFile = ""
                      DebugSymbols = "false"
                      FileAlignment = "4096"
                      IncrementalBuild = "false"
                      NoStdLib = "false"
                      NoWarn = ""
                      Optimize = "false"
                      OutputPath = "bin\Release\"
                      RegisterForComInterop = "false"
                      RemoveIntegerChecks = "false"
                      TreatWarningsAsErrors = "false"
                      WarningLevel = "1"
                  />
              </Settings>
              <References>
                  <Reference
                      Name = "System.XML"
                      AssemblyName = "System.XML"
                      HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                  />
                  <Reference
                      Name = "System.Configuration.Install"
                      AssemblyName = "System.Configuration.Install"
                      HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll"
                  />
                  <Reference
                      Name = "System"
                      AssemblyName = "System"
                      HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
                  />
                  <Reference
                      Name = "log4net-net-1.1"
                      AssemblyName = "log4net-net-1.1"
                      HintPath = "..\..\bin\log4net-net-1.1.dll"
                  />
              </References>
          </Build>
          <Files>
              <Include>
                  <File
                      RelPath = "AbstractConfiguration.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "AbstractLogEnabled.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "AssemblyInfo.cs"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "Attributes.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ConfigurationCollection.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ConfigurationException.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ConsoleLogger.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ContainerUtil.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ContextException.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "Converter.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "DefaultConfiguration.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "DefaultConfigurationSectionHandler.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "DefaultConfigurationSerializer.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "DefaultContext.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "DiagnosticsLogger.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "IConfiguration.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "IContext.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ILogger.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "IServiceManager.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "LifecycleDelegates.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "Log4netLogger.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "NullLogger.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ParameterException.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "Parameters.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "RuntimeSerializer.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
                      RelPath = "ServiceException.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
              </Include>
          </Files>
      </CSHARP>
  </VisualStudioProject>
  
  
  
  
  1.4       +63 -22    avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/profile/ProfileRepositoryTestCase.java
  
  Index: ProfileRepositoryTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/profile/ProfileRepositoryTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProfileRepositoryTestCase.java	29 Apr 2003 14:39:44 -0000	1.3
  +++ ProfileRepositoryTestCase.java	8 Jul 2003 17:18:55 -0000	1.4
  @@ -53,6 +53,7 @@
   import org.apache.avalon.assembly.TestBase;
   import org.apache.avalon.assembly.engine.impl.DefaultProfileRepository;
   import org.apache.avalon.assembly.engine.impl.DefaultTypeRepository;
  +import org.apache.avalon.assembly.engine.type.TypeException;
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
  @@ -93,17 +94,33 @@
       {
           final String classname = "org.apache.avalon.playground.basic.BasicComponent";
   
  +        Type type = null;
           try
           {
  -            Type type = m_types.createType( classname );
  -            Profile[] profiles = m_manager.loadProfiles( type );
  -            assertTrue( profiles.length > 0 );
  -        } catch( Throwable e )
  +            type = m_types.createType( classname );
  +        }
  +        catch( TypeException e )
           {
  -            System.out.println( "failure to create packaged profiles for : " + classname
);
  -            assertTrue( false );
  +            fail("Failure to create type for: " + classname);
  +        }
  +
  +        assertNotNull( type );
  +
  +        Profile[] profiles = null;
  +        try
  +        {
  +            profiles = m_manager.loadProfiles( type );
  +        }
  +        catch ( ProfileException e )
  +        {
  +            String message = "failure to create packaged profiles for: " + classname;
  +            System.out.println( message );
               e.printStackTrace();
  +            fail( message );
           }
  +
  +        assertNotNull( profiles );
  +        assertTrue( profiles.length > 0 );
       }
   
       public void testClassicProfileRegistrationAndRetrival() throws Exception
  @@ -118,10 +135,22 @@
           DependencyDescriptor dep =
                   new DependencyDescriptor( "test", ref );
   
  +        Type type = null;
           try
           {
  -            Type type = m_types.createType( classname );
  -            Profile[] profiles = m_manager.loadProfiles( type );
  +            type = m_types.createType( classname );
  +        }
  +        catch ( TypeException e )
  +        {
  +            fail( "Failure to create type for: " + classname );
  +        }
  +
  +        assertNotNull( type );
  +
  +        Profile[] profiles = null;
  +        try
  +        {
  +            profiles = m_manager.loadProfiles( type );
               for( int i = 0; i < profiles.length; i++ )
               {
                   m_manager.addProfile( profiles[i] );
  @@ -129,11 +158,13 @@
   
               Profile[] candidates = m_manager.getProfiles( dep );
               assertTrue( candidates.length > 0 );
  -        } catch( Throwable e )
  +        }
  +        catch( ProfileException e )
           {
  -            System.out.println( "failure to resolve profile for : " + ref );
  +            String message = "failure to resolve profile for : " + ref;
  +            System.out.println( message );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail( message );
           }
       }
   
  @@ -157,11 +188,17 @@
   
               Profile[] candidates = m_manager.getProfiles( stage );
               assertTrue( candidates.length > 0 );
  -        } catch( Throwable e )
  +        }
  +        catch( TypeException te )
  +        {
  +            fail("Failure toure to create Type for: " + classname);
  +        }
  +        catch( ProfileException e )
           {
  -            System.out.println( "failure to resolve extension handler profile for : " +
reference );
  +            String message = "failure to resolve extension handler profile for : " + reference;
  +            System.out.println( message );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail( message );
           }
       }
   
  @@ -188,11 +225,13 @@
   
               Profile selection = m_manager.getProfile( dep );
               assertTrue( selection != null );
  -        } catch( Throwable e )
  +        }
  +        catch( ProfileException e )
           {
  -            System.out.println( "failure to resolve profile for : " + ref );
  +            String message = "failure to resolve profile for : " + ref;
  +            System.out.println( message );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail( message );
           }
       }
   
  @@ -216,11 +255,13 @@
   
               Profile selection = m_manager.getProfile( stage );
               assertTrue( selection != null );
  -        } catch( Throwable e )
  +        }
  +        catch( ProfileException e )
           {
  -            System.out.println( "failure to resolve extension handler profile for : " +
reference );
  +            String message = "failure to resolve extension handler profile for : " + reference;
  +            System.out.println( message );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail( message );
           }
       }
   
  @@ -230,14 +271,14 @@
           m_types = null;
       }
   
  -    private DefaultTypeRepository createStandardTypeRepository() throws Exception
  +    private DefaultTypeRepository createStandardTypeRepository()
       {
           DefaultTypeRepository manager = new DefaultTypeRepository( m_loader );
           manager.enableLogging( getLogger().getChildLogger( "types" ) );
           return manager;
       }
   
  -    private DefaultProfileRepository createStandardProfileRepository() throws Exception
  +    private DefaultProfileRepository createStandardProfileRepository()
       {
           DefaultProfileRepository manager = new DefaultProfileRepository( m_loader );
           manager.enableLogging( getLogger().getChildLogger( "profiles" ) );
  
  
  
  1.10      +3 -4      avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/TestBase.java
  
  Index: TestBase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/TestBase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestBase.java	8 Jul 2003 15:01:22 -0000	1.9
  +++ TestBase.java	8 Jul 2003 17:18:55 -0000	1.10
  @@ -55,7 +55,6 @@
   
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
  -import org.apache.avalon.assembly.locator.impl.DefaultLocator;
   import org.apache.avalon.assembly.logging.impl.DefaultLoggingManager;
   import org.apache.avalon.assembly.logging.LoggingDescriptor;
   import org.apache.avalon.assembly.logging.LoggingManager;
  @@ -135,11 +134,11 @@
               engine.contextualize( context );
               engine.initialize();
               return engine;
  -        } 
  +        }
           catch( Exception e )
           {
               ExceptionHelper.printException( "Engine setup failure.", e, this, true );
  -            assertTrue( false );
  +            fail( "Engine setup failure." );
               throw e;
           }
       }
  @@ -191,7 +190,7 @@
               DefaultPoolManager poolManager =
                       new DefaultPoolManager( commandManager.getCommandSink() );
               return poolManager;
  -        } 
  +        }
           catch( Throwable e )
           {
               final String error =
  
  
  
  1.11      +4 -0      avalon-sandbox/merlin/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/.cvsignore,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- .cvsignore	7 Jul 2003 18:45:34 -0000	1.10
  +++ .cvsignore	8 Jul 2003 17:18:55 -0000	1.11
  @@ -7,3 +7,7 @@
   activation-spi
   activation
   
  +bin
  +config
  +lib
  +repository
  
  
  
  1.2       +14 -0     avalon-sandbox/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	16 Feb 2003 10:17:15 -0000	1.1
  +++ .cvsignore	8 Jul 2003 17:18:55 -0000	1.2
  @@ -5,3 +5,17 @@
   project.properties
   maven.log
   maven.xml
  +bin
  +meta
  +meta-spi
  +meta-tools
  +.classpath
  +.project
  +Avalon Sandbox.iml
  +Avalon Sandbox.iml
  +Avalon Sandbox.iml
  +Avalon Sandbox.iml
  +Avalon Sandbox.iml
  +Avalon Sandbox.iml
  +Avalon Sandbox.ipr
  +Avalon Sandbox.iws
  
  
  

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


Mime
View raw message