[gentoo-commits] gentoo-x86 commit in dev-java/tomcat-jstl-impl/files: tomcat-jstl-impl-1.2.5-SetSupport.patch tomcat-jstl-impl-1.2.5-ImportSupport.patch tomcat-jstl-impl-1.2.5-build.xml

[Patrice Clement (monsieurp)]

monsieurp    15/06/03 07:58:11

  Added:                tomcat-jstl-impl-1.2.5-SetSupport.patch
                        tomcat-jstl-impl-1.2.5-ImportSupport.patch
                        tomcat-jstl-impl-1.2.5-build.xml
  Log:
  Initial commit. Fix bug 551032.
  
  Signed-off-by: Patrice Clement <monsieurp@g.o>
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

Revision  Changes    Path
1.1                  dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch?rev=1.1&content-type=text/plain

Index: tomcat-jstl-impl-1.2.5-SetSupport.patch
===================================================================
--- impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java.orig	2015-06-01 22:59:35.208000000 +0000
+++ impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java	2015-06-01 22:59:54.191000000 +0000
@@ -334,30 +334,12 @@
     }
 
     @Test
-    public void testResultFromBodyContent() throws JspException {
-        tag = new MockSetSupport();
-        BodyContent bodyContent = createMock(BodyContent.class);
-        expect(bodyContent.getString()).andStubReturn("  Hello  ");
-        replay(bodyContent);
-        tag.setBodyContent(bodyContent);
-        Assert.assertEquals(VALUE, tag.getResult());
-    }
-
-    @Test
     public void testResultFromNullBodyContent() throws JspException {
         tag = new MockSetSupport();
         tag.setBodyContent(null);
         Assert.assertEquals(tag.getResult(), "");
     }
 
-    @Test
-    public void testResultFromEmptyBodyContent() throws JspException {
-        tag = new MockSetSupport();
-        BodyContent bodyContent = createMock(BodyContent.class);
-        expect(bodyContent.getString()).andStubReturn(null);
-        Assert.assertEquals("", tag.getResult());
-    }
-
     public static class MockSetSupport extends SetSupport {
         private final boolean valueSpecified;
         private final Object value;



1.1                  dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch?rev=1.1&content-type=text/plain

Index: tomcat-jstl-impl-1.2.5-ImportSupport.patch
===================================================================
--- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java.orig	2015-06-01 22:34:34.882000000 +0000
+++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java	2015-06-01 22:35:29.078000000 +0000
@@ -36,6 +36,7 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
@@ -430,6 +431,24 @@
             public void write(int b) throws IOException {
                 bos.write(b);
             }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+            }
+
+            @Override
+            public void close() throws IOException {
+            }
+
+            @Override
+            public void flush() throws IOException {
+            }
+
         };
 
         /**



1.1                  dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml?rev=1.1&content-type=text/plain

Index: tomcat-jstl-impl-1.2.5-build.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>

<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
<!-- ====================================================================== -->

<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!--                                                                        -->
<!-- Any modifications will be overwritten.                                 -->
<!--                                                                        -->
<!-- Generated by Maven Ant Plugin on 6/1/15 9:48 PM                        -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
<!--                                                                        -->
<!-- ====================================================================== -->

<project name="taglibs-standard-impl-from-maven" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Build environment properties                                           -->
  <!-- ====================================================================== -->

  <property file="${user.home}/.m2/maven.properties"/>
  <property file="maven-build.properties"/>

  <property name="maven.build.finalName" value="taglibs-standard-impl-1.2.5"/>
  <property name="maven.build.dir" value="target"/>
  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
  <property name="maven.build.srcDir.0" value="src/main/java"/>
  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
  <property name="maven.build.testDir.0" value="src/test/java"/>
  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>

  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="maven.settings.offline" value="false"/>
  <property name="maven.settings.interactiveMode" value="true"/>

  <!-- ====================================================================== -->
  <!-- Defining classpaths                                                    -->
  <!-- ====================================================================== -->

  <path id="build.classpath">
  </path>
  <path id="build.test.classpath">
  </path>

  <!-- ====================================================================== -->
  <!-- Cleaning up target                                                     -->
  <!-- ====================================================================== -->

  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.dir}"/>
  </target>

  <!-- ====================================================================== -->
  <!-- Compilation target                                                     -->
  <!-- ====================================================================== -->

  <target name="compile" description="Compile the code">
    <mkdir dir="${maven.build.outputDir}"/>
    <javac destdir="${maven.build.outputDir}" 
           encoding="UTF-8" 
           nowarn="false" 
           debug="true" 
           optimize="false" 
           deprecation="true" 
           target="1.5" 
           verbose="false" 
           fork="false" 
           source="1.5">
      <src>
        <pathelement location="${maven.build.srcDir.0}"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
    <copy todir="${maven.build.outputDir}">
      <fileset dir="${maven.build.resourceDir.0}"/>
    </copy>
  </target>

  <!-- ====================================================================== -->
  <!-- Test-compilation target                                                -->
  <!-- ====================================================================== -->

  <target name="compile-tests" 
          depends="compile" 
          description="Compile the test code" 
          unless="maven.test.skip">
    <mkdir dir="${maven.build.testOutputDir}"/>
    <javac destdir="${maven.build.testOutputDir}" 
           encoding="UTF-8" 
           nowarn="false" 
           debug="true" 
           optimize="false" 
           deprecation="true" 
           target="1.5" 
           verbose="false" 
           fork="false" 
           source="1.5">
      <src>
        <pathelement location="${maven.build.testDir.0}"/>
      </src>
      <classpath>
        <path refid="build.test.classpath"/>
        <pathelement location="${maven.build.outputDir}"/>
      </classpath>
    </javac>
    <copy todir="${maven.build.testOutputDir}">
      <fileset dir="${maven.build.testResourceDir.0}"/>
    </copy>
  </target>

  <!-- ====================================================================== -->
  <!-- Run all tests                                                          -->
  <!-- ====================================================================== -->

  <target name="test" 
          depends="compile-tests, junit-missing" 
          unless="junit.skipped" 
          description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.test.classpath"/>
        <pathelement location="${maven.build.outputDir}"/>
        <pathelement location="${maven.build.testOutputDir}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}" unless="test">
        <fileset dir="${maven.build.testDir.0}">
          <include name="**/Test*.java"/>
          <include name="**/*Test.java"/>
          <include name="**/*TestCase.java"/>
          <exclude name="**/*Abstract*Test.java"/>
          <exclude name="**/ExprSupportTest.java"/>
          <exclude name="**/EscapeXMLTest.java"/>
        </fileset>
      </batchtest>
      <batchtest todir="${maven.test.reports}" if="test">
        <fileset dir="${maven.build.testDir.0}">
          <include name="**/${test}.java"/>
          <exclude name="**/*Abstract*Test.java"/>
          <exclude name="**/ExprSupportTest.java"/>
          <exclude name="**/EscapeXMLTest.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>

  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
  </target>

  <target name="test-junit-status" 
          depends="test-junit-present">
    <condition property="junit.missing">
      <and>
        <isfalse value="${junit.present}"/>
        <isfalse value="${maven.test.skip}"/>
      </and>
    </condition>
    <condition property="junit.skipped">
      <or>
        <isfalse value="${junit.present}"/>
        <istrue value="${maven.test.skip}"/>
      </or>
    </condition>
  </target>

  <target name="junit-missing" 
          depends="test-junit-status" 
          if="junit.missing">
    <echo>=================================== WARNING ===================================</echo>
    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
    <echo>===============================================================================</echo>
  </target>

  <!-- ====================================================================== -->
  <!-- Javadoc target                                                         -->
  <!-- ====================================================================== -->

  <target name="javadoc" description="Generates the Javadoc of the application">
    <javadoc sourcepath="${maven.build.srcDir.0}" 
             packagenames="*" 
             destdir="${maven.reporting.outputDirectory}/apidocs" 
             access="protected" 
             old="false" 
             verbose="false" 
             version="true" 
             use="true" 
             author="true" 
             splitindex="false" 
             nodeprecated="false" 
             nodeprecatedlist="false" 
             notree="false" 
             noindex="false" 
             nohelp="false" 
             nonavbar="false" 
             serialwarn="false" 
             charset="ISO-8859-1" 
             linksource="false" 
             breakiterator="false">
      <link href="http://download.oracle.com/javase/1.5.0/docs/api"/>
    </javadoc>
  </target>

  <!-- ====================================================================== -->
  <!-- Package target                                                         -->
  <!-- ====================================================================== -->

  <target name="package" depends="compile,test" description="Package the application">
    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
         compress="true" 
         index="false" 
         basedir="${maven.build.outputDir}" 
         excludes="**/package.html">
      <manifest>
        <attribute name="Main-Class" value="Main"/>
      </manifest>
    </jar>
  </target>

  <!-- ====================================================================== -->
  <!-- A dummy target for the package named after the type it creates         -->
  <!-- ====================================================================== -->

  <target name="jar" depends="package" description="Builds the jar for the application"/>

  <!-- ====================================================================== -->
  <!-- Download dependencies target                                           -->
  <!-- ====================================================================== -->

  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${maven.settings.offline}" arg2="true"/>
    </condition>
  </target>
</project>