POM changes look fine...
Thanks,
Snjezana
----- Original Message -----
From: kinman.chung_at_oracle.com
To: dev_at_glassfish.java.net
Sent: Wednesday, December 7, 2011 2:37:51 PM GMT -08:00 US/Canada Pacific
Subject: Pom change review - jstl.1.2.1 integration
Change Summary:
1. Integrate jstl api (1.2.1) and jstl impl (1.2.1)
Note the artifact ids have been changed. The jar file names have
been changed.
2. Remove the repackaging module: javaee-api/javax.servlet.jsp.jstl
Passed quicklook tests.
Thanks.
misto:v312%svn diff
Index: core/kernel/src/test/resources/DomainTest.xml
===================================================================
--- core/kernel/src/test/resources/DomainTest.xml (revision 51355)
+++ core/kernel/src/test/resources/DomainTest.xml (working copy)
@@ -181,7 +181,7 @@
<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib</jvm-options>
<jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
<jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
-
<jvm-options>-Dcom.sun.enterprise.taglibs=appserv-jstl.jar,javax.faces.jar</jvm-options>
+
<jvm-options>-Dcom.sun.enterprise.taglibs=javax.servlet.jsp.jstl.jar,javax.faces.jar</jvm-options>
<jvm-options>-Dcom.sun.enterprise.taglisteners=javax.faces.jar</jvm-options>
<jvm-options>-XX:NewRatio=2</jvm-options>
</java-config>
Index: pom.xml
===================================================================
--- pom.xml (revision 51355)
+++ pom.xml (working copy)
@@ -117,8 +117,8 @@
<jsp-impl.version>2.2.3</jsp-impl.version>
<el-api.version>2.2.4</el-api.version>
<el-impl.version>2.2.3</el-impl.version>
- <jstl-impl.version>1.2</jstl-impl.version>
- <jstl-api.version>1.2</jstl-api.version>
+ <jstl-impl.version>1.2.1</jstl-impl.version>
+ <jstl-api.version>1.2.1</jstl-api.version>
<mojarra.version>2.1.6</mojarra.version>
<jsf-ext.version>0.2</jsf-ext.version>
<woodstock.version>4.0.2.8</woodstock.version>
@@ -1529,12 +1529,12 @@
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl-api</artifactId>
+ <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>${jstl-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>jstl-impl</artifactId>
+ <artifactId>javax.servlet.jsp.jstl</artifactId>
<version>${jstl-impl.version}</version>
</dependency>
<dependency>
Index: jdbc/admin/src/test/resources/DomainTest.xml
===================================================================
--- jdbc/admin/src/test/resources/DomainTest.xml (revision 51355)
+++ jdbc/admin/src/test/resources/DomainTest.xml (working copy)
@@ -181,7 +181,7 @@
<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib</jvm-options>
<jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
<jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
-
<jvm-options>-Dcom.sun.enterprise.taglibs=appserv-jstl.jar,javax.faces.jar</jvm-options>
+
<jvm-options>-Dcom.sun.enterprise.taglibs=javax.servlet.jsp.jstl.jar,javax.faces.jar</jvm-options>
<jvm-options>-Dcom.sun.enterprise.taglisteners=javax.faces.jar</jvm-options>
<jvm-options>-XX:NewRatio=2</jvm-options>
</java-config>
Index: javaee-api/javax.servlet.jsp.jstl/exclude.xml
===================================================================
--- javaee-api/javax.servlet.jsp.jstl/exclude.xml (revision 51355)
+++ javaee-api/javax.servlet.jsp.jstl/exclude.xml (working copy)
@@ -1,53 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can
- obtain a copy of the License at
-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- or packager/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice
in each
- file and include the License file at packager/legal/LICENSE.txt.
-
- GPL Classpath Exception:
- Oracle designates this particular file as subject to the "Classpath"
- exception as provided by Oracle in the GPL Version 2 section of the
License- file that accompanied this code.
-
- Modifications:
- If applicable, add the following below the License Header, with the
fields
- enclosed by brackets [] replaced by your own identifying information:
- "Portions Copyright [year] [name of copyright owner]"
-
- Contributor(s):
- If you wish your version of this file to be governed by only the
CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the
[CDDL or GPL- Version 2] license." If you don't indicate a single
choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of
license to
- its licensees as provided above. However, if you add GPL Version 2
code
- and therefore, elected the GPL Version 2 license, then the option
applies
- only if the new code is made subject to such option by the copyright
- holder.
-
--->
-
-<FindBugsFilter>
- <!--
- This bug in the JSTL public API can't be fixed until
- we update the JSTL API.
- -->
- <Match>
- <Class name="javax.servlet.jsp.jstl.core.IteratedValueExpression"/>
- <Bug pattern="SE_BAD_FIELD"/>
- <Priority value="1"/>
- </Match>
-</FindBugsFilter>
Index: javaee-api/javax.servlet.jsp.jstl/osgi.bundle
===================================================================
--- javaee-api/javax.servlet.jsp.jstl/osgi.bundle (revision 51355)
+++ javaee-api/javax.servlet.jsp.jstl/osgi.bundle (working copy)
@@ -1,41 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License"). You
-# may not use this file except in compliance with the License. You can
-# obtain a copy of the License at
-#
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in
each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the
License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the
fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL
or GPL
-# Version 2] license." If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above. However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-
-Import-Package: javax.servlet; javax.servlet.http; version="2.5", *
Index: javaee-api/javax.servlet.jsp.jstl/pom.xml
===================================================================
--- javaee-api/javax.servlet.jsp.jstl/pom.xml (revision 51355)
+++ javaee-api/javax.servlet.jsp.jstl/pom.xml (working copy)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights
reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can
- obtain a copy of the License at
-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- or packager/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice
in each
- file and include the License file at packager/legal/LICENSE.txt.
-
- GPL Classpath Exception:
- Oracle designates this particular file as subject to the "Classpath"
- exception as provided by Oracle in the GPL Version 2 section of the
License- file that accompanied this code.
-
- Modifications:
- If applicable, add the following below the License Header, with the
fields
- enclosed by brackets [] replaced by your own identifying information:
- "Portions Copyright [year] [name of copyright owner]"
-
- Contributor(s):
- If you wish your version of this file to be governed by only the
CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the
[CDDL or GPL- Version 2] license." If you don't indicate a single
choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of
license to
- its licensees as provided above. However, if you add GPL Version 2
code
- and therefore, elected the GPL Version 2 license, then the option
applies
- only if the new code is made subject to such option by the copyright
- holder.
-
--->
-
-<project xmlns="
http://maven.apache.org/POM/4.0.0"
xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.glassfish.main.javaee-api</groupId>
- <artifactId>javaee-api</artifactId>
- <version>3.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <properties>
- <extension.name>javax.servlet.jsp.jstl</extension.name>
- <spec.version>1.2</spec.version>
- <findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
- </properties>
- <artifactId>${extension.name}</artifactId>
- <packaging>jar</packaging>
- <name>${extension.name} API v.${spec.version}</name>
- <description>JSTL API Repackaged as OSGi bundle in GlassFish</description>
- <dependencies>
- <dependency>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl-api</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
Index: javaee-api/pom.xml
===================================================================
--- javaee-api/pom.xml (revision 51355)
+++ javaee-api/pom.xml (working copy)
@@ -149,7 +149,6 @@
<module>javax.annotation</module>
<module>javax.jms</module>
<module>javax.jws</module>
- <module>javax.servlet.jsp.jstl</module>
<module>javax.xml.rpc</module>
<module>javax.xml.soap</module>
<!-- StAX is part of Java SE 6, so need for it to be built anymore.
Index: packager/nucleus-base/lib/templates/default-web.xml
===================================================================
--- packager/nucleus-base/lib/templates/default-web.xml (revision 51355)
+++ packager/nucleus-base/lib/templates/default-web.xml (working copy)
@@ -316,15 +316,15 @@
<param-value>
/lib/
\lib\
- jstl-impl.jar
javax.el-api.jar
javax.el.jar
javax.faces.jar
javax.servlet-api.jar
javax.servlet.jsp-api.jar
+ javax.servlet.jsp.jar
+ javax.servlet.jsp.jstl-api.jar
javax.servlet.jsp.jstl.jar
javax.jms.jar
- javax.servlet.jsp.jar
jspcaching-connector.jar
web-glue.jar
bean-validator.jar
Index: web/jstl-connector/pom.xml
===================================================================
--- web/jstl-connector/pom.xml (revision 51355)
+++ web/jstl-connector/pom.xml (working copy)
@@ -60,14 +60,11 @@
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>jstl-impl</artifactId>
+ <artifactId>javax.servlet.jsp.jstl</artifactId>
</dependency>
- <!-- We need this as jstl-impl does not depend on
- OSGied version of JSTL API -->
<dependency>
- <groupId>org.glassfish.main.javaee-api</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>javax.servlet.jsp.jstl-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
misto:v312%