avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-excalibur/sourceresolve fortress-meta.xml default.properties build.xml
Date Fri, 23 May 2003 16:13:42 GMT
bloritsch    2003/05/23 09:13:41

  Modified:    fortress build.xml
               sourceresolve/src/java/org/apache/excalibur/source/impl
                        SourceResolverImpl.java
               sourceresolve default.properties build.xml
  Added:       xmlutil/src/xdocs book.xml tabs.xml
               sourceresolve fortress-meta.xml
  Log:
  Apply patch from Anton about incorporating Fortress-Tools into the SourceResolver project.
  There is a temporary hack, but that will be removed when we have a Tools project.  We need
  to fix the deps issue.
  
  Revision  Changes    Path
  1.97      +1 -0      avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- build.xml	23 May 2003 13:17:35 -0000	1.96
  +++ build.xml	23 May 2003 16:13:39 -0000	1.97
  @@ -260,6 +260,7 @@
               <fileset dir="${build.classes}">
                   <include name="**/util/Service*"/>
                   <include name="**/role/Service*"/>
  +                <include name="**/dag/*"/>
               </fileset>
           </jar>
       </target>
  
  
  
  1.32      +4 -4      avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/SourceResolverImpl.java
  
  Index: SourceResolverImpl.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/SourceResolverImpl.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- SourceResolverImpl.java	20 May 2003 20:56:43 -0000	1.31
  +++ SourceResolverImpl.java	23 May 2003 16:13:40 -0000	1.32
  @@ -163,7 +163,7 @@
        * Set the current <code>ComponentLocator</code> instance used by this
        * <code>Composable</code>.
        *
  -     * @avalon.dependency type="org.apache.excalibur.source.SourceFactorySelector"
  +     * @avalon.dependency type="org.apache.excalibur.source.SourceFactory"
        */
       public void service( final ServiceManager manager )
           throws ServiceException
  @@ -187,7 +187,7 @@
   
       /**
        * Get a <code>Source</code> object.
  -     * @throws SourceNotFoundException if the source cannot be found
  +     * @throws org.apache.excalibur.source.SourceNotFoundException if the source cannot
be found
        */
       public Source resolveURI( String location )
           throws MalformedURLException, IOException, SourceException
  @@ -197,7 +197,7 @@
   
       /**
        * Get a <code>Source</code> object.
  -     * @throws SourceNotFoundException if the source cannot be found
  +     * @throws org.apache.excalibur.source.SourceNotFoundException if the source cannot
be found
        */
       public Source resolveURI( String location,
                                 String baseURI,
  
  
  
  1.4       +6 -13     avalon-excalibur/xmlutil/src/xdocs/book.xml
  
  
  
  
  1.1                  avalon-excalibur/xmlutil/src/xdocs/tabs.xml
  
  Index: tabs.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
        <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd">
  
        <tabs software="Excalibur store"
          title="Excalibur store"
          copyright="Foo"
          xmlns:xlink="http://www.w3.org/1999/xlink">
  
          <tab label="Avalon Home" href="http://avalon.apache.org/"/>
          <tab label="Framework" href="http://avalon.apache.org/framework/"/>
          <tab label="Components" href="http://avalon.apache.org/components/"/>
          <tab label="Phoenix" href="http://avalon.apache.org/phoenix/"/>
          <tab label="SECA" href="http://avalon.apache.org/seca/"/>
  
      </tabs>
  
  
  
  1.13      +11 -0     avalon-excalibur/sourceresolve/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/sourceresolve/default.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- default.properties	6 Feb 2003 13:38:34 -0000	1.12
  +++ default.properties	23 May 2003 16:13:40 -0000	1.13
  @@ -21,6 +21,16 @@
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +# ----- Avalon Fortress, version 1.0 or later  -----
  +avalon-fortress.home=${basedir}/../fortress
  +avalon-fortress.lib=${avalon-fortress.home}/dist
  +avalon-fortress-tools.jar=${avalon-fortress.lib}/excalibur-fortress-tools-1.0.jar
  +# ----- QDox Jar ----
  +qdox.jar=${basedir}/../lib/qdox-1.1.jar
  +
  +# --------------------------------------------------
   
   #  Settings used to configure compile environment
   build.debug = on
  @@ -44,6 +54,7 @@
   java.dir = ${src.dir}/java
   conf.dir = ${src.dir}/conf
   test.dir = ${src.dir}/test
  +fortress-static-meta.dir = ${src.dir}/fortress.meta
   
   #  needed by Cocoon
   build.context = ${build.dir}/documentation
  
  
  
  1.38      +1 -0      avalon-excalibur/sourceresolve/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/sourceresolve/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml	20 May 2003 20:56:42 -0000	1.37
  +++ build.xml	23 May 2003 16:13:40 -0000	1.38
  @@ -72,6 +72,7 @@
               </fileset>
           </copy>
   
  +        <ant antfile="fortress-meta.xml"/>
       </target>
   
       <!-- Compiles the unit test source code -->
  
  
  
  1.1                  avalon-excalibur/sourceresolve/fortress-meta.xml
  
  Index: fortress-meta.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <project name="Excalibur SourceResolving Fortress Meta Info Management" basedir="."
      default="provide-fortress-meta">
  
      <property file="${user.home}/build.properties"/>
      <property file="${basedir}/../ant.properties"/>
      <property file="${basedir}/ant.properties"/>
      <property file="${user.home}/.ant.properties"/>
      <property file="${basedir}/../libraries.properties"/>
      <property file="${basedir}/../default.properties"/>
      <property file="${basedir}/default.properties"/>
  
      <path id="fortress.tools.classpath">
          <pathelement location="${avalon-fortress-tools.jar}"/>
          <pathelement location="${qdox.jar}"/>
      </path>
  
      <property
          name="fortress.collect-meta.classname"
          value="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector"/>
  
      <!-- ===================================================================== -->
      <!-- Generate or copy fortress meta descriptors                            -->
      <!-- ===================================================================== -->
  
      <target
          name="provide-fortress-meta"
          description="Add fortress meta descriptors to the compiled classes"
          depends="provide-fortress-meta-dynamic, provide-fortress-meta-static"/>
  
      <target
          name="provide-fortress-meta-dynamic"
          depends="test-fortress-collect-meta-present"
          if="avalon-fortress-tools.present">
  
          <taskdef name="fortress-collect-meta"
              classname="${fortress.collect-meta.classname}"
              classpathref="fortress.tools.classpath"/>
  
          <fortress-collect-meta destdir="${build.classes}">
              <fileset dir="${java.dir}"/>
          </fortress-collect-meta>
  
          <!-- save it for future use via provide-fortress-meta-static -->
          <antcall target="do-save-fortress-meta"/>
  
      </target>
  
      <target
          name="provide-fortress-meta-static"
          depends="test-fortress-collect-meta-present, complain-fortress-meta-static"
          unless="avalon-fortress-tools.present">
  
          <copy todir="${build.classes}">
              <fileset dir="${fortress-static-meta.dir}">
                  <include name="services.list"/>
                  <include name="META-INF/services/*"/>
                  <include name="**/*.meta"/>
                  <include name="**/*.dep"/>
              </fileset>
          </copy>
  
      </target>
  
      <target name="complain-fortress-meta-static" unless="avalon-fortress-tools.present">
          <echo>
              .----------------------------------------------------------------.
              | HAVE NOT FOUND SOME OF                                         |
              |                                                                |
              | ${avalon-fortress-tools.jar}
              | ${qdox.jar}"
              |----------------------------------------------------------------|
              | Fortress meta info for Excalibur SourceResolving can not       |
              | be generated dynamically.                                      |
              |                                                                |
              | As a bootrstrap workaround I will use static fortress          |
              | meta info from                                                 |
              |                                                                |
              | ${fortress-static-meta.dir}
              |                                                                |
              | This is okay if you only build Excalibur SourceResolving.      |
              |                                                                |
              | If you do any SourceResolving development and espcially if you |
              | deal with Fortress meta data in SourceResolving classes please |
              | do build or download the jars required for dynamic Fortress    |
              | meta info generation.                                          |
              |                                                                |
              '----------------------------------------------------------------'
          </echo>
      </target>
  
      <!-- ===================================================================== -->
      <!-- Check if excalibur-fortress-tools.jar and qdox.jar are present        -->
      <!-- ===================================================================== -->
      <target name="test-fortress-collect-meta-present">
          <!-- To avoid circular dependency we don't want to build avalon-fortress-tools.jar
-->
          <!-- We'll also use static meta descriptors if do not find it - so we do not
      -->
          <!-- want to fail the build if do not find it. Hence depchecker.xml not used
      -->
          <!-- currently.                                                             
      -->
          <available
              classname="${fortress.collect-meta.classname}"
              classpathref="fortress.tools.classpath"
              property="avalon-fortress-tools.present"/>
      </target>
  
      <!-- ===================================================================== -->
      <!-- Save generated meta for later static use                              -->
      <!-- by provide-fortress-meta-static                                       -->
      <!-- ===================================================================== -->
  
      <!-- ===================================================================== -->
      <!-- Because the copy operation is very destructive - we first erase all   -->
      <!-- existing fortress meta info, we want to make sure that the info has   -->
      <!-- really been generated.                                                -->
      <!-- This is what save-fortress-meta does. It is intended to be invoked    -->
      <!-- directly from the command line directly, via                          -->
      <!-- ant -f fortress-meta.xml save-fotress-meta.                           -->
      <!-- ===================================================================== -->
      <target
          name="save-fortress-meta"
          description="Copy generated fortress meta back under ./src"
          depends="conditionally-save-fortress-meta, complain-save-fortress-meta"/>
  
      <target
          name="conditionally-save-fortress-meta"
          depends="test-fortress-meta-generated"
          if="fortress.meta.generated">
          <antcall target="do-save-fortress-meta"/>
      </target>
  
      <!-- ===================================================================== -->
      <!-- Do copy the generated meta to ${fortress-static-meta.dir} without any -->
      <!-- checks. Invoked from conditionally-save-fortress-meta and from        -->
      <!-- provide-fortress-meta-dynamic.                                        -->
      <target name="do-save-fortress-meta">
  
          <!--delete stale meta info-->
          <delete dir="${fortress-static-meta.dir}"/>
  
          <mkdir dir="${fortress-static-meta.dir}"/>
  
          <copy todir="${fortress-static-meta.dir}">
              <fileset dir="${build.classes}">
                  <include name="services.list"/>
                  <include name="META-INF/services/*"/>
                  <include name="**/*.meta"/>
                  <include name="**/*.dep"/>
              </fileset>
          </copy>
  
      </target>
  
      <target name="complain-save-fortress-meta" depends="test-fortress-meta-generated"
          unless="fortress.meta.generated">
          <echo>
              .----------------------------------------------------------------.
              | FILE NOT FOUND                                                 |
              |                                                                |
              | ${build.classes}/services.list
              |----------------------------------------------------------------|
              | Fortress meta info has not been generated.                     |
              |                                                                |
              | ${fortress-static-meta.dir}
              |                                                                |
              | has not been changed.                                          |
              '----------------------------------------------------------------'
          </echo>
      </target>
  
      <target name="test-fortress-meta-generated">
          <available
              file="${build.classes}/services.list"
              property="fortress.meta.generated"/>
      </target>
  
  </project>
  
  

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


Mime
View raw message