avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test ExcaliburRoleManagerTestCase.java
Date Fri, 08 Nov 2002 06:28:10 GMT
donaldp     2002/11/07 22:28:10

  Modified:    .        build.xml depchecker.xml
               fortress build.xml default.properties
               fortress/src/test/org/apache/excalibur/fortress/util/test
                        ExcaliburRoleManagerTestCase.java
  Log:
  Remove references to xmlbundle.
  
  Revision  Changes    Path
  1.190     +46 -54    jakarta-avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -r1.189 -r1.190
  --- build.xml	1 Oct 2002 03:37:38 -0000	1.189
  +++ build.xml	8 Nov 2002 06:28:09 -0000	1.190
  @@ -13,74 +13,74 @@
       <property name="build.tests" value="${build.dir}/tests"/>
   
       <target name="main" depends="jar"/>
  -    
  +
       <target name="check-subproject-target" unless="subproject-target">
           <echo message="subproject target was not set.  defaulting to 'jar'"/>
           <property name="subproject-target" value="jar"/>
       </target>
  -    
  +
       <!-- ************************************************************ -->
       <!-- Subproject targets                                           -->
       <!-- ************************************************************ -->
       <!-- List projects in alphabetical order.  All dependent projects -->
       <!--  within Excalibur should be listed in the depends list.      -->
       <!--  Do not include test dependent jars in the depends list.     -->
  -    
  +
       <!-- Altrmi -->
       <target name="prj-altrmi" depends="prj-pool">
           <ant dir="altrmi" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Assembly (Merlin 2) -->
       <target name="prj-assembly" depends="prj-i18n, prj-configuration, prj-container,
prj-meta, prj-extension, prj-event, prj-collections, prj-concurrent, prj-util, prj-logger">
           <ant dir="assembly" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Baxter -->
       <target name="prj-baxter">
           <ant dir="baxter" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- BZip2 -->
       <target name="prj-bzip2">
           <ant dir="bzip2" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Cache -->
       <target name="prj-cache">
           <ant dir="cache" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Cli -->
       <target name="prj-cli">
           <ant dir="cli" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Collections -->
       <target name="prj-collections">
           <ant dir="collections" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Component -->
       <target name="prj-component" depends="prj-collections, prj-instrument, prj-instrument-manager,
prj-logger, prj-pool">
           <ant dir="component" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Concurrent -->
       <target name="prj-concurrent">
           <ant dir="concurrent" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Configuration -->
       <target name="prj-configuration">
           <ant dir="configuration" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Container -->
       <target name="prj-container">
           <ant dir="container" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Info -->
       <target name="prj-info" depends="prj-i18n">
           <ant dir="info" target="${subproject-target}"/>
  @@ -90,67 +90,67 @@
       <target name="prj-containerkit" depends="prj-i18n,prj-info">
           <ant dir="containerkit" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Converter -->
       <target name="prj-converter" depends="prj-i18n">
           <ant dir="converter" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Datasource -->
       <target name="prj-datasource" depends="prj-instrument, prj-pool">
           <ant dir="datasource" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Event -->
       <target name="prj-event" depends="prj-collections, prj-concurrent, prj-thread">
           <ant dir="event" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Extension -->
       <target name="prj-extension">
           <ant dir="extension" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Fortress -->
       <target name="prj-fortress" depends="prj-altrmi, prj-assembly, prj-collections,
prj-container, prj-event, prj-instrument, prj-instrument-manager, prj-logger, prj-sourceresolve,
prj-threadcontext">
           <ant dir="fortress" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- I18n -->
       <target name="prj-i18n">
           <ant dir="i18n" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Instrument -->
       <target name="prj-instrument">
           <ant dir="instrument" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- InstrumentClient -->
       <target name="prj-instrument-client" depends="prj-altrmi, prj-instrument-manager">
           <ant dir="instrument-client" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- InstrumentManager -->
       <target name="prj-instrument-manager" depends="prj-altrmi, prj-instrument">
           <ant dir="instrument-manager" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- IO -->
       <target name="prj-io">
           <ant dir="io" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- JProcess -->
       <target name="prj-jprocess" depends="prj-io, prj-threadcontext">
           <ant dir="jprocess" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Logger -->
       <target name="prj-logger">
           <ant dir="logger" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Merlin 1.0 -->
       <target name="prj-merlin" depends="prj-configuration" >
           <ant dir="merlin" target="${subproject-target}"/>
  @@ -160,85 +160,80 @@
       <target name="prj-meta" depends="prj-i18n, prj-configuration">
           <ant dir="meta" target="${subproject-target}"/>
       </target>
  -   
  +
       <!-- Monitor -->
       <target name="prj-monitor" depends="prj-logger, prj-sourceresolve">
           <ant dir="monitor" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Naming -->
       <target name="prj-naming">
           <ant dir="naming" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Pool -->
       <target name="prj-pool" depends="prj-collections, prj-instrument">
           <ant dir="pool" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- SourceResolve -->
       <target name="prj-sourceresolve" depends="prj-pool">
           <ant dir="sourceresolve" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Store -->
       <target name="prj-store">
           <ant dir="store" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Tar -->
       <target name="prj-tar">
           <ant dir="tar" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Testcase -->
       <target name="prj-testcase" depends="prj-component, prj-logger">
           <ant dir="testcase" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Thread -->
       <target name="prj-thread" depends="prj-instrument, prj-pool, prj-threadcontext">
           <ant dir="thread" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- ThreadContext -->
       <target name="prj-threadcontext">
           <ant dir="threadcontext" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Tweety -->
       <target name="prj-tweety">
           <ant dir="tweety" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Util -->
       <target name="prj-util">
           <ant dir="util" target="${subproject-target}"/>
       </target>
  -    
  -    <!-- XMLBundle -->
  -    <target name="prj-xmlbundle" depends="prj-component, prj-sourceresolve, prj-xmlutil">
  -        <ant dir="xmlbundle" target="${subproject-target}"/>
  -    </target>
  -    
  +
       <!-- XMLUtil -->
       <target name="prj-xmlutil" depends="prj-collections, prj-component, prj-instrument,
prj-logger, prj-pool, prj-sourceresolve, prj-store, prj-testcase">
           <ant dir="xmlutil" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- Zip -->
       <target name="prj-zip">
           <ant dir="zip" target="${subproject-target}"/>
       </target>
  -    
  +
       <!-- ************************************************************ -->
       <!-- Build all Subprojects target                                 -->
       <!-- ************************************************************ -->
       <!-- This target depends on all of the projects above.  Relies on -->
       <!--  Ant to decide on the correct build order. -->
  -    <target name="build-all-subprojects" depends="prj-altrmi, prj-assembly, prj-baxter,
prj-bzip2, prj-cache, prj-cli, prj-collections, prj-component, prj-concurrent, prj-configuration,
prj-container, prj-containerkit, prj-converter, prj-datasource, prj-event, prj-extension,
prj-fortress, prj-i18n, prj-instrument, prj-instrument-client, prj-instrument-manager, prj-io,
prj-jprocess, prj-logger, prj-merlin, prj-meta, prj-monitor, prj-naming, prj-pool, prj-sourceresolve,
prj-store, prj-tar, prj-testcase, prj-thread, prj-threadcontext, prj-tweety, prj-util, prj-xmlbundle,
prj-xmlutil, prj-zip">
  +    <target name="build-all-subprojects" depends="prj-altrmi, prj-assembly, prj-baxter,
prj-bzip2, prj-cache, prj-cli, prj-collections, prj-component, prj-concurrent, prj-configuration,
prj-container, prj-containerkit, prj-converter, prj-datasource, prj-event, prj-extension,
prj-fortress, prj-i18n, prj-instrument, prj-instrument-client, prj-instrument-manager, prj-io,
prj-jprocess, prj-logger, prj-merlin, prj-meta, prj-monitor, prj-naming, prj-pool, prj-sourceresolve,
prj-store, prj-tar, prj-testcase, prj-thread, prj-threadcontext, prj-tweety, prj-util, prj-xmlutil,
prj-zip">
       </target>
  -    
  +
       <!-- ************************************************************ -->
       <!-- Actual Build Targets                                         -->
       <!-- ************************************************************ -->
  @@ -293,8 +288,6 @@
               <pathelement location="store/src/test"/>
               <pathelement location="tar/src/java"/>
               <pathelement location="tar/src/test"/>
  -            <pathelement location="xmlbundle/src/java"/>
  -            <pathelement location="xmlbundle/src/test"/>
               <pathelement location="zip/src/java"/>
               <pathelement location="zip/src/test"/>
           </path>
  @@ -346,7 +339,7 @@
           <!-- As we know the order here is correct, we don't need to do
           dependency checking -->
           <property name="skip.dependencies" value="true"/>
  -        
  +
           <ant target="build-all-subprojects">
               <property name="subproject-target" value="dist-jar"/>
           </ant>
  @@ -381,7 +374,6 @@
                       <include name="datasource/dist/*.jar"/>
                       <include name="util/dist/*.jar"/>
                       <include name="store/dist/*.jar"/>
  -                    <include name="xmlbundle/dist/*.jar"/>
                       <include name="xmlutil/dist/*.jar"/>
                       <include name="cli/dist/*.jar"/>
                       <include name="naming/dist/*.jar"/>
  @@ -422,7 +414,7 @@
                   <fileset dir=".">
                       <include name="*/build/lib/*.jar"/>
                       <include name="altrmi/**"/>
  -                    
  +
                       <!-- Instrument client is a standalone application -->
                       <exclude name="instrument-client/**"/>
                   </fileset>
  @@ -459,7 +451,7 @@
       <!-- Clean -->
       <target name="clean" description="Cleans each of the subprojects">
           <delete dir="${build.dir}" />
  -        
  +
           <ant target="build-all-subprojects">
               <property name="subproject-target" value="real-clean"/>
           </ant>
  
  
  
  1.44      +1 -9      jakarta-avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- depchecker.xml	30 Sep 2002 21:50:28 -0000	1.43
  +++ depchecker.xml	8 Nov 2002 06:28:09 -0000	1.44
  @@ -508,14 +508,6 @@
           </ant>
       </target>
   
  -    <target name="checkXMLBundle">
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="proj.jar.name" value="excalibur-xmlbundle.jar"/>
  -            <property name="path" value="${excalibur-xmlbundle.jar}"/>
  -            <property name="proj.home" value="${basedir}/../xmlbundle"/>
  -        </ant>
  -    </target>
  -
       <target name="checkXMLUtil">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
               <property name="proj.jar.name" value="excalibur-xmlutil.jar"/>
  
  
  
  1.57      +0 -2      jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- build.xml	8 Nov 2002 06:06:12 -0000	1.56
  +++ build.xml	8 Nov 2002 06:28:09 -0000	1.57
  @@ -54,7 +54,6 @@
           <pathelement location="${excalibur-cache.jar}"/>
           <pathelement location="${excalibur-monitor.jar}"/>
           <pathelement location="${excalibur-xmlutil.jar}"/>
  -        <pathelement location="${excalibur-xmlbundle.jar}"/>
           <pathelement location="${excalibur-scratchpad.jar}"/>
           <pathelement location="${xalan.jar}"/>
           <pathelement location="${jaxen-full.jar}"/>
  @@ -137,7 +136,6 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkDatasource"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCache"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLBundle"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMonitor"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLUtil"/>
        </target>
  
  
  
  1.40      +0 -5      jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- default.properties	23 Oct 2002 07:47:39 -0000	1.39
  +++ default.properties	8 Nov 2002 06:28:09 -0000	1.40
  @@ -63,11 +63,6 @@
   excalibur-xmlutil.jar=${excalibur-xmlutil.lib}/excalibur-xmlutil-1.0.jar
   jaxen-full.jar=${basedir}/../xmlutil/lib/jaxen-full.jar
   
  -# ----- Excalibur XMLBundle, version 1.0 or later -----
  -excalibur-xmlbundle.home=${basedir}/../xmlbundle/dist
  -excalibur-xmlbundle.lib=${excalibur-xmlbundle.home}
  -excalibur-xmlbundle.jar=${excalibur-xmlbundle.lib}/excalibur-xmlbundle-1.0.jar
  -
   # ----- Excalibur logger, version 1.0 or later -----
   excalibur-logger.home=${basedir}/../logger/dist
   excalibur-logger.lib=${excalibur-logger.home}
  
  
  
  1.17      +1 -24     jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
  
  Index: ExcaliburRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ExcaliburRoleManagerTestCase.java	13 Aug 2002 07:57:27 -0000	1.16
  +++ ExcaliburRoleManagerTestCase.java	8 Nov 2002 06:28:10 -0000	1.17
  @@ -124,10 +124,6 @@
               );
           }
           assertEquals(
  -            roles.getClassForName( "i18n" ),
  -            Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector" )
  -        );
  -        assertEquals(
               roles.getClassForName( "monitor" ),
               Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor" )
           );
  @@ -191,10 +187,6 @@
               );
           }
           assertEquals(
  -            roles.getNameForClass( Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector"
) ),
  -            "i18n"
  -        );
  -        assertEquals(
               roles.getNameForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor"
) ),
               "monitor"
           );
  @@ -258,10 +250,6 @@
               );
           }
           assertEquals(
  -            roles.getRoleForClass( Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector"
) ),
  -            "org.apache.excalibur.xmlbundle.BundleSelector"
  -        );
  -        assertEquals(
               roles.getRoleForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor"
) ),
               "org.apache.avalon.excalibur.monitor.Monitor"
           );
  @@ -330,13 +318,6 @@
               );
           }
   
  -        classes = roles.getClassesForRole( "org.apache.excalibur.xmlbundle.BundleSelector"
);
  -
  -        assertEquals(
  -            classes[ 0 ],
  -            Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector" )
  -        );
  -
           classes = roles.getClassesForRole( "org.apache.avalon.excalibur.monitor.Monitor"
);
   
           assertEquals(
  @@ -411,10 +392,6 @@
                   Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
               );
           }
  -        assertEquals(
  -            roles.getHandlerClassForClass( Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector"
) ),
  -            Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
  -        );
           assertEquals(
               roles.getHandlerClassForClass( Class.forName( "org.apache.avalon.excalibur.monitor.ActiveMonitor"
) ),
               Class.forName( "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
)
  
  
  

--
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