425837 Upgrade to jstl 1.2.2

2014-01-17 14:36:08 +11:00 · 2014-01-17 14:36:08 +11:00 · 1e2e3fc7f2
parent 93013b36dd
commit 1e2e3fc7f2
6 changed files with 92 additions and 41 deletions
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@ -440,11 +440,38 @@
            </goals>
            <configuration>
              <includeGroupIds>org.eclipse.jetty.orbit,org.glassfish.web, org.glassfish, javax.el, javax.servlet.jsp, org.eclipse.jetty.toolchain</includeGroupIds>
-              <includeArtifactIds>javax.servlet.jsp.jstl,org.apache.taglibs.standard.glassfish,org.eclipse.jdt.core, javax.servlet.jsp-api, javax.servlet.jsp, jetty-jsp-jdt, javax.el-api, javax.el</includeArtifactIds>
+              <includeArtifactIds>org.eclipse.jdt.core, javax.servlet.jsp-api, javax.servlet.jsp, jetty-jsp-jdt, javax.el-api, javax.el</includeArtifactIds>
              <includeTypes>jar</includeTypes>
              <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
            </configuration>
          </execution>
+          <execution>
+           <id>copy-jstl-api</id>
+           <phase>generate-resources</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
+              <includeArtifactIds>javax.servlet.jsp.jstl</includeArtifactIds>
+              <prependGroupId>true</prependGroupId>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
+           </configuration>
+          </execution>
+          <execution>
+           <id>copy-jstl-impl</id>
+           <phase>generate-resources</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+              <includeGroupIds>org.glassfish.web</includeGroupIds>
+              <includeArtifactIds>javax.servlet.jsp.jstl</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
+           </configuration>
+          </execution>
          <execution>
            <id>copy-jaspi-deps</id>
            <phase>generate-resources</phase>
@ -571,9 +598,10 @@
      <groupId>org.eclipse.jetty.orbit</groupId>
      <artifactId>javax.security.auth.message</artifactId>
    </dependency>
+
    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>javax.servlet.jsp.jstl</artifactId>
    </dependency>

    <dependency>
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@ -62,8 +62,8 @@
    </dependency>
    <!-- JSTL Impl -->
    <dependency>
-       <groupId>org.eclipse.jetty.orbit</groupId>
-       <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
+       <groupId>org.glassfish.web</groupId>
+       <artifactId>javax.servlet.jsp.jstl</artifactId>
    </dependency>

    <!-- EL Api -->
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@ -100,10 +100,10 @@
 javax.servlet.jsp;version="[2.3,2.4)",
 javax.servlet.jsp.el;version="[2.3,2.4)",
 javax.servlet.jsp.tagext;version="[2.3,2.4)",
- javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.jstl.fmt;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.jstl.sql;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.jstl.tlv;version="1.2.0";resolution:=optional,
+ javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional,
+ javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional,
+ javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional,
+ javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional,
 org.apache.jasper;version="[2.3.2,2.4)";resolution:=optional,
 org.apache.jasper.compiler;version="[2.3.2,2.4)";resolution:=optional,
 org.apache.jasper.compiler.tagplugin;version="[2.3.2,2.4)";resolution:=optional,
@ -114,29 +114,29 @@
 org.apache.jasper.util;version="[2.3.2,2.4)";resolution:=optional,
 org.apache.jasper.xmlparser;version="[2.3.2,2.4)";resolution:=optional,
 org.glassfish.jsp.api;version="[2.3.2,2.4)";resolution:=optional,
- org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl.parser;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl.test;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.lang.support;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.resources;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.core;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.fmt;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.sql;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.common.xml;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.core;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.fmt;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.sql;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.el.xml;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.core;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.fmt;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.sql;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tag.rt.xml;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tei;version="1.2.0";resolution:=optional,
- org.apache.taglibs.standard.tlv;version="1.2.0";resolution:=optional,
+ org.apache.taglibs.standard;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.functions;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.resources;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tei;version="1.2";resolution:=optional,
+ org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional,
 org.osgi.*,
 org.xml.*;resolution:=optional,
 org.xml.sax.*;resolution:=optional,
@ -144,7 +144,7 @@
 org.w3c.dom;resolution:=optional,
 org.w3c.dom.ls;resolution:=optional,
 javax.xml.parser;resolution:=optional
-                </Import-Package>
+ </Import-Package>
                <_nouses>true</_nouses>
                <DynamicImport-Package>org.apache.jasper.*;version="2.3"</DynamicImport-Package>
              </instructions>
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java
@ -77,6 +77,10 @@ public class TestJettyOSGiBootWebAppAsService
        options.add(CoreOptions.junitBundles());
        options.addAll(configureJettyHomeAndPort("jetty-selector.xml"));
        options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*"));
+        options.add(CoreOptions.systemPackages("com.sun.org.apache.xalan.internal.res","com.sun.org.apache.xml.internal.utils",
+                                               "com.sun.org.apache.xml.internal.utils", "com.sun.org.apache.xpath.internal",
+                                               "com.sun.org.apache.xpath.internal.jaxp", "com.sun.org.apache.xpath.internal.objects"));
+     
        options.addAll(TestJettyOSGiBootCore.coreJettyDependencies());
        
        String logLevel = "WARN";
@ -123,7 +127,7 @@ public class TestJettyOSGiBootWebAppAsService
        //jsp bundles
        res.add(mavenBundle().groupId("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").versionAsInProject());
        res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("javax.servlet.jsp.jstl").versionAsInProject());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("org.apache.taglibs.standard.glassfish").versionAsInProject());
+        res.add(mavenBundle().groupId("org.glassfish.web").artifactId("javax.servlet.jsp.jstl").versionAsInProject());
        res.add(mavenBundle().groupId("org.glassfish").artifactId("javax.el").versionAsInProject());
        res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("org.eclipse.jdt.core").versionAsInProject());
        res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-jsp-fragment").versionAsInProject().noStart());
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
@ -42,6 +42,7 @@ import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;

 /**
@ -70,6 +71,10 @@ public class TestJettyOSGiBootWithJsp
        options.add(CoreOptions.junitBundles());
        options.addAll(configureJettyHomeAndPort("jetty-selector.xml"));
        options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*"));
+        options.add(CoreOptions.systemPackages("com.sun.org.apache.xalan.internal.res","com.sun.org.apache.xml.internal.utils",
+                                               "com.sun.org.apache.xml.internal.utils", "com.sun.org.apache.xpath.internal",
+                                               "com.sun.org.apache.xpath.internal.jaxp", "com.sun.org.apache.xpath.internal.objects"));
+     
        options.addAll(TestJettyOSGiBootCore.coreJettyDependencies());

        String logLevel = "WARN";
@ -139,7 +144,7 @@ public class TestJettyOSGiBootWithJsp
        //jetty jsp bundles
        res.add(mavenBundle().groupId("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").versionAsInProject());
        res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("javax.servlet.jsp.jstl").versionAsInProject());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("org.apache.taglibs.standard.glassfish").versionAsInProject());
+        res.add(mavenBundle().groupId("org.glassfish.web").artifactId("javax.servlet.jsp.jstl").versionAsInProject());
        res.add(mavenBundle().groupId("org.glassfish").artifactId("javax.el").versionAsInProject());
        res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("org.eclipse.jdt.core").versionAsInProject());
        res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-jsp-fragment").versionAsInProject().noStart());
@ -155,7 +160,7 @@ public class TestJettyOSGiBootWithJsp
    @Test
    public void assertAllBundlesActiveOrResolved()
    {
-        TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext);
+        TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext);        
    }

    // at the moment can't run httpservice with jsp at the same time.
@ -167,6 +172,7 @@ public class TestJettyOSGiBootWithJsp
        TestOSGiUtil.testHttpServiceGreetings(bundleContext, "http", TestJettyOSGiBootCore.DEFAULT_JETTY_HTTP_PORT);
    }

+
    @Test
    public void testJspDump() throws Exception
    {
--- a/pom.xml
+++ b/pom.xml
@ -531,17 +531,30 @@

    <!-- JSTL Impl -->
    <dependency>
-       <groupId>org.eclipse.jetty.orbit</groupId>
-       <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
-       <version>1.2.0.v201112081803</version>
+       <groupId>org.glassfish.web</groupId>
+       <artifactId>javax.servlet.jsp.jstl</artifactId>
+       <version>1.2.2</version>
      <exclusions>
        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>
+          <groupId>javax.servlet.jsp.jstl</groupId>
+          <artifactId>jstl-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.el</groupId>
+          <artifactId>el-api</artifactId>
        </exclusion>
      </exclusions>
    </dependency>

+     <!-- JSTL API -->
      <dependency>
        <groupId>org.eclipse.jetty.orbit</groupId>
        <artifactId>javax.servlet.jsp.jstl</artifactId>