You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/11/23 20:36:13 UTC

cvs commit: jakarta-turbine-fulcrum/factory/src/test/org/apache/fulcrum/factory/utils ObjectInputStreamForContextTest.java

epugh       2004/11/23 11:36:13

  Modified:    mimetype .cvsignore
               localization .cvsignore
               pool     .cvsignore
               factory  .cvsignore
  Added:       factory/xdocs tasks.xml changes.xml navigation.xml index.xml
               pool/src/test TestRoleConfig.xml TestComponentConfig.xml
               pool/xdocs navigation.xml index.xml changes.xml
               mimetype project.properties project.xml maven.xml
               localization/src/test TestRoleConfig.xml
                        TestComponentConfig.xml
               localization project.xml maven.xml project.properties
               mimetype/src/java/org/apache/fulcrum/mimetype/util
                        MimeTypeMap.java MimeTypeMapper.java
                        CharSetMap.java MimeType.java
               factory/src/test/org/apache/fulcrum/factory
                        FactoryServiceTest.java
               factory/src/java/org/apache/fulcrum/factory
                        DefaultFactoryService.java Factory.java
                        FactoryException.java FactoryService.java
               mimetype/src/test TestComponentConfig.xml TestRoleConfig.xml
               localization/src/test/org/apache/fulcrum/localization
                        LocalizationTest.java FooBundle_fr.java
                        BarBundle_ko_KR.java FooBundle_en.java
                        BarBundle_en_US.java LocaleTokenizerTest.java
               pool     maven.xml project.xml
               mimetype/src/test/org/apache/fulcrum/mimetype
                        MimetypeTest.java
               factory/src/test TestRoleConfig.xml TestComponentConfig.xml
               factory  maven.xml project.xml
               pool/src/java/org/apache/fulcrum/pool
                        InitableRecyclable.java PoolService.java
                        BoundedBuffer.java PoolException.java
                        DefaultPoolService.java ArrayCtorRecyclable.java
                        Recyclable.java ObjectInputStreamForContext.java
               localization/xdocs index.xml navigation.xml changes.xml
               localization/src/java/org/apache/fulcrum/localization
                        LocaleTokenizer.java LocalizationService.java
                        DefaultLocalizationService.java
               mimetype/src/test/org/apache/fulcrum/mimetype/util
                        MimeTypeMapperTest.java
               mimetype/src/java/org/apache/fulcrum/mimetype
                        MimeTypeService.java DefaultMimeTypeService.java
               factory/src/java/org/apache/fulcrum/factory/utils
                        ObjectInputStreamForContext.java
               mimetype/xdocs changes.xml properties.xml navigation.xml
                        index.xml
               pool/src/test/org/apache/fulcrum/pool PoolServiceTest.java
               factory/src/test/org/apache/fulcrum/factory/utils
                        ObjectInputStreamForContextTest.java
  Removed:     localization/impl/src/test/org/apache/fulcrum/localization
                        FooBundle_en.java LocalizationTest.java
                        BarBundle_en_US.java FooBundle_fr.java
                        LocaleTokenizerTest.java BarBundle_ko_KR.java
               factory/impl/xdocs tasks.xml navigation.xml changes.xml
                        index.xml
               pool/impl project.xml maven.xml .cvsignore
               factory/impl/src/test TestRoleConfig.xml
                        TestComponentConfig.xml
               mimetype/impl/xdocs index.xml properties.xml changes.xml
                        navigation.xml
               localization/api project.xml .cvsignore
               mimetype/impl/src/java/org/apache/fulcrum/mimetype/util
                        CharSetMap.java MimeTypeMap.java
                        MimeTypeMapper.java
               mimetype/api/src/java/org/apache/fulcrum/mimetype/util
                        MimeType.java
               pool/api/src/java/org/apache/fulcrum/pool PoolService.java
                        Recyclable.java PoolException.java
                        InitableRecyclable.java
               localization/api/xdocs changes.xml
               localization/impl project.xml project.properties .cvsignore
                        maven.xml
               factory/api/src/java/org/apache/fulcrum/factory
                        FactoryException.java FactoryService.java
                        Factory.java
               localization/impl/xdocs changes.xml navigation.xml index.xml
               factory/api .cvsignore project.xml
               factory/impl maven.xml project.xml .cvsignore
               pool/impl/src/test TestComponentConfig.xml
                        TestRoleConfig.xml
               factory/impl/src/test/org/apache/fulcrum/factory/utils
                        ObjectInputStreamForContextTest.java
               mimetype/impl project.xml .cvsignore project.properties
                        maven.xml
               mimetype/impl/src/test/org/apache/fulcrum/mimetype
                        MimetypeTest.java
               localization/impl/src/java/org/apache/fulcrum/localization
                        LocaleTokenizer.java
                        DefaultLocalizationService.java
               factory/impl/src/java/org/apache/fulcrum/factory
                        DefaultFactoryService.java
               pool/api project.xml .cvsignore
               mimetype/api/xdocs changes.xml
               pool/impl/src/java/org/apache/fulcrum/pool
                        BoundedBuffer.java ObjectInputStreamForContext.java
                        DefaultPoolService.java ArrayCtorRecyclable.java
               pool/impl/src/test/org/apache/fulcrum/pool
                        PoolServiceTest.java
               pool/api/xdocs changes.xml
               localization/api/src/java/org/apache/fulcrum/localization
                        LocalizationService.java
               mimetype/api .cvsignore project.xml
               mimetype/impl/src/test/org/apache/fulcrum/mimetype/util
                        MimeTypeMapperTest.java
               localization/impl/src/test TestRoleConfig.xml
                        TestComponentConfig.xml
               pool/impl/xdocs index.xml navigation.xml changes.xml
               mimetype/api/src/java/org/apache/fulcrum/mimetype
                        MimeTypeService.java
               mimetype/impl/src/test TestRoleConfig.xml
                        TestComponentConfig.xml
               mimetype/impl/src/java/org/apache/fulcrum/mimetype
                        DefaultMimeTypeService.java
               factory/impl/src/java/org/apache/fulcrum/factory/utils
                        ObjectInputStreamForContext.java
               factory/api/xdocs changes.xml
               factory/impl/src/test/org/apache/fulcrum/factory
                        FactoryServiceTest.java
  Log:
  Merge api/impl into single project
  
  Revision  Changes    Path
  1.3       +0 -0      jakarta-turbine-fulcrum/factory/xdocs/tasks.xml
  
  
  
  
  1.1                  jakarta-turbine-fulcrum/factory/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <properties>
      <title>Fulcrum Factory</title>
      <author email="epugh@opensourceconnections.com">Eric Pugh</author>
    </properties>
  
    <body>
      <release version="1.0.3" date="">
        <action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
          Merge api and impl jars into one project.
        </action>         
        <action dev="epugh" type="update">
        	Clean up dependencies.  Use TestContainer.
        </action>           
      </release>     
  	<release version="1.0.2" date="">
        <action dev="epugh" type="update">
        	Update to use Merlin 3.3.0
        </action>
      </release>
    </body>
  </document>
  
  
  
  
  1.4       +0 -0      jakarta-turbine-fulcrum/factory/xdocs/navigation.xml
  
  
  
  
  1.3       +134 -7    jakarta-turbine-fulcrum/factory/xdocs/index.xml
  
  
  
  
  1.3       +2 -2      jakarta-turbine-fulcrum/pool/src/test/TestRoleConfig.xml
  
  
  
  
  1.3       +4 -3      jakarta-turbine-fulcrum/pool/src/test/TestComponentConfig.xml
  
  
  
  
  1.3       +0 -0      jakarta-turbine-fulcrum/pool/xdocs/navigation.xml
  
  
  
  
  1.3       +53 -14    jakarta-turbine-fulcrum/pool/xdocs/index.xml
  
  
  
  
  1.1                  jakarta-turbine-fulcrum/pool/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <properties>
      <title>Fulcrum Pool Impl</title>
      <author email="epugh@opensourceconnections.com">Eric Pugh</author>
    </properties>
  
    <body>
      <release version="1.0.3" date="in cvs">
        <action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
          Merge api and impl jars into one project.
        </action>         
        <action dev="epugh" type="update">
          Clean up dependencies.  Use TestContainer.
        </action>           
        <action dev="epugh" type="update">
          Bump versions, clean up dependencies
        </action>           
      </release>     
      <release version="1.0.2" date="in cvs">
        <action dev="epugh" type="update">
          Update to use Merlin 3.3.0
        </action>           
      </release>   
    </body>
  </document>
  
  
  
  
  1.3       +1 -0      jakarta-turbine-fulcrum/mimetype/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore	27 Oct 2003 16:51:43 -0000	1.2
  +++ .cvsignore	23 Nov 2004 19:36:09 -0000	1.3
  @@ -3,3 +3,4 @@
   .classpath
   .project
   jcoverage.ser
  +*.merlin
  
  
  
  1.3       +1 -1      jakarta-turbine-fulcrum/mimetype/project.properties
  
  
  
  
  1.5       +8 -17     jakarta-turbine-fulcrum/mimetype/project.xml
  
  
  
  
  1.1                  jakarta-turbine-fulcrum/mimetype/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
  
    <!--preGoal name="java:compile">
      <attainGoal name="avalon:meta"/>
    </preGoal-->
  
  </project>
  
  
  1.3       +3 -1      jakarta-turbine-fulcrum/localization/src/test/TestRoleConfig.xml
  
  
  
  
  1.3       +3 -2      jakarta-turbine-fulcrum/localization/src/test/TestComponentConfig.xml
  
  
  
  
  1.3       +1 -0      jakarta-turbine-fulcrum/localization/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/localization/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore	27 Oct 2003 16:51:43 -0000	1.2
  +++ .cvsignore	23 Nov 2004 19:36:10 -0000	1.3
  @@ -3,3 +3,4 @@
   .classpath
   .project
   jcoverage.ser
  +*.merlin
  
  
  
  1.4       +22 -17    jakarta-turbine-fulcrum/localization/project.xml
  
  
  
  
  1.1                  jakarta-turbine-fulcrum/localization/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
  
    <!--preGoal name="java:compile">
      <attainGoal name="avalon:meta"/>
    </preGoal-->
  
  </project>
  
  
  1.3       +1 -1      jakarta-turbine-fulcrum/localization/project.properties
  
  
  
  
  1.3       +55 -88    jakarta-turbine-fulcrum/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMap.java
  
  
  
  
  1.3       +34 -56    jakarta-turbine-fulcrum/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeTypeMapper.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/mimetype/src/java/org/apache/fulcrum/mimetype/util/CharSetMap.java
  
  
  
  
  1.3       +19 -52    jakarta-turbine-fulcrum/mimetype/src/java/org/apache/fulcrum/mimetype/util/MimeType.java
  
  
  
  
  1.4       +32 -20    jakarta-turbine-fulcrum/factory/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java
  
  
  
  
  1.3       +21 -55    jakarta-turbine-fulcrum/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
  
  
  
  
  1.3       +17 -52    jakarta-turbine-fulcrum/factory/src/java/org/apache/fulcrum/factory/Factory.java
  
  
  
  
  1.3       +17 -53    jakarta-turbine-fulcrum/factory/src/java/org/apache/fulcrum/factory/FactoryException.java
  
  
  
  
  1.3       +15 -54    jakarta-turbine-fulcrum/factory/src/java/org/apache/fulcrum/factory/FactoryService.java
  
  
  
  
  1.3       +0 -0      jakarta-turbine-fulcrum/mimetype/src/test/TestComponentConfig.xml
  
  
  
  
  1.3       +0 -0      jakarta-turbine-fulcrum/mimetype/src/test/TestRoleConfig.xml
  
  
  
  
  1.5       +28 -66    jakarta-turbine-fulcrum/localization/src/test/org/apache/fulcrum/localization/LocalizationTest.java
  
  
  
  
  1.3       +16 -0     jakarta-turbine-fulcrum/localization/src/test/org/apache/fulcrum/localization/FooBundle_fr.java
  
  
  
  
  1.3       +16 -0     jakarta-turbine-fulcrum/localization/src/test/org/apache/fulcrum/localization/BarBundle_ko_KR.java
  
  
  
  
  1.3       +16 -0     jakarta-turbine-fulcrum/localization/src/test/org/apache/fulcrum/localization/FooBundle_en.java
  
  
  
  
  1.3       +16 -0     jakarta-turbine-fulcrum/localization/src/test/org/apache/fulcrum/localization/BarBundle_en_US.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/localization/src/test/org/apache/fulcrum/localization/LocaleTokenizerTest.java
  
  
  
  
  1.6       +2 -0      jakarta-turbine-fulcrum/pool/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/pool/.cvsignore,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- .cvsignore	14 Feb 2004 14:25:49 -0000	1.5
  +++ .cvsignore	23 Nov 2004 19:36:11 -0000	1.6
  @@ -2,3 +2,5 @@
   *.log
   .classpath
   .project
  +jcoverage.ser
  +.merlin
  
  
  
  1.1                  jakarta-turbine-fulcrum/pool/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
  
    <!--preGoal name="java:compile">
      <attainGoal name="avalon:meta"/>
    </preGoal-->
  
  </project>
  
  
  1.4       +12 -19    jakarta-turbine-fulcrum/pool/project.xml
  
  
  
  
  1.4       +48 -104   jakarta-turbine-fulcrum/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
  
  
  
  
  1.3       +3 -1      jakarta-turbine-fulcrum/factory/src/test/TestRoleConfig.xml
  
  
  
  
  1.3       +2 -1      jakarta-turbine-fulcrum/factory/src/test/TestComponentConfig.xml
  
  
  
  
  1.5       +4 -0      jakarta-turbine-fulcrum/factory/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/.cvsignore,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- .cvsignore	12 Feb 2004 18:46:00 -0000	1.4
  +++ .cvsignore	23 Nov 2004 19:36:11 -0000	1.5
  @@ -1,2 +1,6 @@
   target
   *.log
  +.classpath
  +.project
  +jcoverage.ser
  +*.merlin
  
  
  
  1.1                  jakarta-turbine-fulcrum/factory/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
  
    <!--preGoal name="java:compile">
      <attainGoal name="avalon:meta"/>
    </preGoal-->
  
  </project>
  
  
  1.4       +10 -17    jakarta-turbine-fulcrum/factory/project.xml
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/InitableRecyclable.java
  
  
  
  
  1.3       +17 -54    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/PoolService.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/BoundedBuffer.java
  
  
  
  
  1.3       +17 -53    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/PoolException.java
  
  
  
  
  1.3       +35 -65    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/ArrayCtorRecyclable.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/Recyclable.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java
  
  
  
  
  1.3       +45 -2     jakarta-turbine-fulcrum/localization/xdocs/index.xml
  
  
  
  
  1.3       +0 -0      jakarta-turbine-fulcrum/localization/xdocs/navigation.xml
  
  
  
  
  1.4       +25 -3     jakarta-turbine-fulcrum/localization/xdocs/changes.xml
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/localization/src/java/org/apache/fulcrum/localization/LocaleTokenizer.java
  
  
  
  
  1.3       +19 -56    jakarta-turbine-fulcrum/localization/src/java/org/apache/fulcrum/localization/LocalizationService.java
  
  
  
  
  1.5       +25 -71    jakarta-turbine-fulcrum/localization/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
  
  
  
  
  1.3       +57 -15    jakarta-turbine-fulcrum/mimetype/src/test/org/apache/fulcrum/mimetype/util/MimeTypeMapperTest.java
  
  
  
  
  1.3       +25 -61    jakarta-turbine-fulcrum/mimetype/src/java/org/apache/fulcrum/mimetype/MimeTypeService.java
  
  
  
  
  1.3       +41 -72    jakarta-turbine-fulcrum/mimetype/src/java/org/apache/fulcrum/mimetype/DefaultMimeTypeService.java
  
  
  
  
  1.3       +16 -52    jakarta-turbine-fulcrum/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java
  
  
  
  
  1.3       +23 -2     jakarta-turbine-fulcrum/mimetype/xdocs/changes.xml
  
  
  
  
  1.1                  jakarta-turbine-fulcrum/mimetype/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  
  <document>
  
    <properties>
      <title>Fulcrum Mimetype Properties</title>
      <author email="epugh@opensourceconnections.com">Eric Pugh</author>
    </properties>
  
    <body>
      <section name="Fulcrum Mimetype Settings">
        <table>
          <tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
          <tr>
            <td>mimetypes</td>
            <td>Yes</td>
            <td>
               This property specifies a file containing mappings between MIME 
               content types and the corresponding file name extensions. The
               service itself contains a hardcoded set of most common mappings. 
              The file must use the same syntax as the mime.types file of 
              the Apache Server, i.e. 
              [mimetype] [ext1] [ext2]...  
              <p/>
              For example /WEB-INF/conf/mime.types
            </td>
          </tr>
          <tr>
            <td>charsets</td>
            <td>Yes</td>
            <td>
              This property specifies a file containing mappings between locales 
              and the corresponding character encodings. The service itself 
              contains a hardcoded set of most common mappings. 
              The file should use the Java property file syntax, i.e. 
              lang_country_variant=charset
              <p/>
              For example /WEB-INF/conf/charset.properties
            </td>
          </tr>       
          
        </table>
      </section>
  
    </body>
  </document>
  
  
  
  1.3       +1 -0      jakarta-turbine-fulcrum/mimetype/xdocs/navigation.xml
  
  
  
  
  1.4       +70 -8     jakarta-turbine-fulcrum/mimetype/xdocs/index.xml
  
  
  
  
  1.4       +34 -60    jakarta-turbine-fulcrum/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java
  
  
  
  
  1.3       +17 -4     jakarta-turbine-fulcrum/factory/src/test/org/apache/fulcrum/factory/utils/ObjectInputStreamForContextTest.java
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org