FYI, and thanks to Alexey for the hard work, GlassFish v3 is now using
our OSGi package directly!
-- Jeanfrancois
-------- Original Message --------
Subject: svn commit: r24270 - trunk/v3: . admin/jmx-remote/client
admin/jmx-remote/common admin/jmx-remote/server common/container-common
common/glassfish-a...
Date: Mon, 12 Jan 2009 15:07:15 +0000
From: oleksiys_at_dev.java.net
Reply-To: commits_at_glassfish-svn.dev.java.net
To: commits_at_glassfish-svn.dev.java.net
Author: oleksiys
Date: 2009-01-12 15:07:13+0000
New Revision: 24270
Removed:
trunk/v3/distributions/external/grizzly-http/
trunk/v3/distributions/external/grizzly-optionals/
Modified:
trunk/v3/admin/jmx-remote/client/pom.xml
trunk/v3/admin/jmx-remote/common/pom.xml
trunk/v3/admin/jmx-remote/server/pom.xml
trunk/v3/common/container-common/pom.xml
trunk/v3/common/glassfish-api/osgi.bundle
trunk/v3/common/glassfish-api/pom.xml
trunk/v3/common/internal-api/pom.xml
trunk/v3/core/kernel/pom.xml
trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java
trunk/v3/distributions/external/pom.xml
trunk/v3/embedded/api/pom.xml
trunk/v3/extras/grizzly-container/pom.xml
trunk/v3/extras/phobos/pom.xml
trunk/v3/extras/php/pom.xml
trunk/v3/packager/glassfish-grizzly/pom.xml
trunk/v3/packager/glassfish-scripting/pom.xml
trunk/v3/pom.xml
trunk/v3/security/webintegration/pom.xml
trunk/v3/synchronization/pom.xml
trunk/v3/web/tomcat-connector/pom.xml
trunk/v3/web/web-ajp/pom.xml
trunk/v3/web/web-core/pom.xml
trunk/v3/web/web-glue/pom.xml
Log:
+ Integrate Grizzly 1.9.3
+ Grizzly 1.9.3 is OSGi compliant. Do not repackage it
Modified: trunk/v3/admin/jmx-remote/client/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/admin/jmx-remote/client/pom.xml?view=diff&rev=24270&p1=trunk/v3/admin/jmx-remote/client/pom.xml&p2=trunk/v3/admin/jmx-remote/client/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/admin/jmx-remote/client/pom.xml (original)
+++ trunk/v3/admin/jmx-remote/client/pom.xml 2009-01-12 15:07:13+0000
@@ -153,14 +153,6 @@
<dependency>
- <groupId>org.glassfish.external</groupId>
-
- <artifactId>grizzly-module</artifactId>
-
- </dependency>
-
- <dependency>
-
<groupId>org.glassfish.core</groupId>
<artifactId>kernel</artifactId>
Modified: trunk/v3/admin/jmx-remote/common/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/admin/jmx-remote/common/pom.xml?view=diff&rev=24270&p1=trunk/v3/admin/jmx-remote/common/pom.xml&p2=trunk/v3/admin/jmx-remote/common/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/admin/jmx-remote/common/pom.xml (original)
+++ trunk/v3/admin/jmx-remote/common/pom.xml 2009-01-12 15:07:13+0000
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.glassfish</groupId>
-
+
<artifactId>javax.servlet</artifactId>
<version>${project.version}</version>
@@ -138,15 +138,6 @@
<dependency>
- <groupId>org.glassfish.external</groupId>
-
- <artifactId>grizzly-module</artifactId>
-
-
- </dependency>
-
- <dependency>
-
<groupId>org.glassfish.core</groupId>
<artifactId>kernel</artifactId>
Modified: trunk/v3/admin/jmx-remote/server/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/admin/jmx-remote/server/pom.xml?view=diff&rev=24270&p1=trunk/v3/admin/jmx-remote/server/pom.xml&p2=trunk/v3/admin/jmx-remote/server/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/admin/jmx-remote/server/pom.xml (original)
+++ trunk/v3/admin/jmx-remote/server/pom.xml 2009-01-12 15:07:13+0000
@@ -35,144 +35,141 @@
* 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">
+-->
+ <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>
+ <parent>
- <groupId>org.glassfish.admin.jmx-remote</groupId>
+ <groupId>org.glassfish.admin.jmx-remote</groupId>
- <artifactId>jmx-remote</artifactId>
+ <artifactId>jmx-remote</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
- </parent>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>jmx-remote-server</artifactId>
+ <artifactId>jmx-remote-server</artifactId>
- <packaging>hk2-jar</packaging>
+ <packaging>hk2-jar</packaging>
- <name>JMX Remote Service Server</name>
+ <name>JMX Remote Service Server</name>
- <description>HTTP JMX connector server infrastructure in GF
V3</description>
+ <description>HTTP JMX connector server infrastructure in GF
V3</description>
- <developers>
-
- <developer>
-
- <id>ne110415</id>
+ <developers>
- <name>Nandini Ektare</name>
+ <developer>
- <url>
http://blogs.sun.com/nektare</url>
+ <id>ne110415</id>
- <organization>Sun Microsystems, Inc.</organization>
+ <name>Nandini Ektare</name>
- <roles>
+ <url>
http://blogs.sun.com/nektare</url>
- <role>lead</role>
+ <organization>Sun Microsystems, Inc.</organization>
- <role>developer</role>
+ <roles>
- </roles>
+ <role>lead</role>
- </developer>
+ <role>developer</role>
- </developers>
+ </roles>
- <build>
+ </developer>
- <resources>
+ </developers>
- <resource>
+ <build>
- <directory>src/main/java</directory>
+ <resources>
- <includes>
+ <resource>
- <include>**/*.properties</include>
+ <directory>src/main/java</directory>
- </includes>
+ <includes>
- </resource>
+ <include>**/*.properties</include>
- </resources>
+ </includes>
- </build>
+ </resource>
- <dependencies>
-
- <dependency>
-
- <groupId>org.glassfish.admin.jmx-remote</groupId>
+ </resources>
- <artifactId>jmx-remote-common</artifactId>
+ </build>
- <version>${project.version}</version>
+ <dependencies>
- </dependency>
+ <dependency>
- <dependency>
+ <groupId>org.glassfish.admin.jmx-remote</groupId>
- <groupId>org.glassfish.external</groupId>
+ <artifactId>jmx-remote-common</artifactId>
- <artifactId>jmxremote_optional-repackaged</artifactId>
+ <version>${project.version}</version>
- <version>${project.version}</version>
+ </dependency>
- </dependency>
+ <dependency>
- <dependency>
+ <groupId>org.glassfish.external</groupId>
- <groupId>org.glassfish</groupId>
+ <artifactId>jmxremote_optional-repackaged</artifactId>
- <artifactId>javax.servlet</artifactId>
+ <version>${project.version}</version>
- <version>${project.version}</version>
+ </dependency>
- </dependency>
+ <dependency>
- <dependency>
+ <groupId>org.glassfish</groupId>
- <groupId>org.glassfish.common</groupId>
+ <artifactId>javax.servlet</artifactId>
- <artifactId>glassfish-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- </dependency>
+ <dependency>
- <dependency>
+ <groupId>org.glassfish.common</groupId>
- <groupId>org.glassfish.external</groupId>
+ <artifactId>glassfish-api</artifactId>
- <artifactId>grizzly-module</artifactId>
- </dependency>
+ </dependency>
- <dependency>
+ <dependency>
- <groupId>org.glassfish.core</groupId>
+ <groupId>org.glassfish.core</groupId>
- <artifactId>kernel</artifactId>
+ <artifactId>kernel</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
- </dependency>
+ </dependency>
- <dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>apache-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.glassfish.external</groupId>
+ <artifactId>apache-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ </dependencies>
-</project>
+ </project>
Modified: trunk/v3/common/container-common/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/common/container-common/pom.xml?view=diff&rev=24270&p1=trunk/v3/common/container-common/pom.xml&p2=trunk/v3/common/container-common/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/common/container-common/pom.xml (original)
+++ trunk/v3/common/container-common/pom.xml 2009-01-12 15:07:13+0000
@@ -137,13 +137,20 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-optionals</artifactId>
- </dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-comet</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: trunk/v3/common/glassfish-api/osgi.bundle
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/common/glassfish-api/osgi.bundle?view=diff&rev=24270&p1=trunk/v3/common/glassfish-api/osgi.bundle&p2=trunk/v3/common/glassfish-api/osgi.bundle&r1=24269&r2=24270
==============================================================================
--- trunk/v3/common/glassfish-api/osgi.bundle (original)
+++ trunk/v3/common/glassfish-api/osgi.bundle 2009-01-12 15:07:13+0000
@@ -16,5 +16,4 @@
org.glassfish.api.naming, \
org.glassfish.api.web, \
org.glassfish.api.branding
-Import-Package: com.sun.grizzly.*; version=${grizzly.package-version}, *
Modified: trunk/v3/common/glassfish-api/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/common/glassfish-api/pom.xml?view=diff&rev=24270&p1=trunk/v3/common/glassfish-api/pom.xml&p2=trunk/v3/common/glassfish-api/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/common/glassfish-api/pom.xml (original)
+++ trunk/v3/common/glassfish-api/pom.xml 2009-01-12 15:07:13+0000
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
- <artifactId>grizzly-http-utils</artifactId>
+ <artifactId>grizzly-utils</artifactId>
<version>${grizzly.original-version}</version>
<scope>provided</scope>
</dependency>
Modified: trunk/v3/common/internal-api/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/common/internal-api/pom.xml?view=diff&rev=24270&p1=trunk/v3/common/internal-api/pom.xml&p2=trunk/v3/common/internal-api/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/common/internal-api/pom.xml (original)
+++ trunk/v3/common/internal-api/pom.xml 2009-01-12 15:07:13+0000
@@ -73,10 +73,11 @@
<artifactId>config-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/v3/core/kernel/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/core/kernel/pom.xml?view=diff&rev=24270&p1=trunk/v3/core/kernel/pom.xml&p2=trunk/v3/core/kernel/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/core/kernel/pom.xml (original)
+++ trunk/v3/core/kernel/pom.xml 2009-01-12 15:07:13+0000
@@ -105,8 +105,19 @@
<artifactId>hk2</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-framework</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
Modified:
trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java?view=diff&rev=24270&p1=trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java&p2=trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java&r1=24269&r2=24270
==============================================================================
---
trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java
(original)
+++
trunk/v3/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/AbstractHttpHandler.java
2009-01-12 15:07:13+0000
@@ -25,7 +25,7 @@
import com.sun.grizzly.Context;
import com.sun.grizzly.ProtocolFilter;
-import com.sun.grizzly.http.HtmlHelper;
+import com.sun.grizzly.util.http.HtmlHelper;
import com.sun.grizzly.tcp.Adapter;
import com.sun.grizzly.util.OutputWriter;
import java.io.IOException;
@@ -90,7 +90,7 @@
//TODO: Some Application might not have Adapter. Might
want to
//add a dummy one instead of sending a 404.
try {
- ByteBuffer bb = HtmlHelper.getErrorPage("Not
Found", "HTTP/1.1 404 Not Found\n");
+ ByteBuffer bb = HtmlHelper.getErrorPage("Not
Found", "HTTP/1.1 404 Not Found\n", "Glassfish/v3");
OutputWriter.flushChannel
(selectionKey.channel(),bb);
} catch (IOException ex){
Modified: trunk/v3/distributions/external/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/distributions/external/pom.xml?view=diff&rev=24270&p1=trunk/v3/distributions/external/pom.xml&p2=trunk/v3/distributions/external/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/distributions/external/pom.xml (original)
+++ trunk/v3/distributions/external/pom.xml 2009-01-12 15:07:13+0000
@@ -63,8 +63,6 @@
<module>commons-codec</module>
<module>ldapbp</module>
<module>asm-all</module>
- <module>grizzly-http</module>
- <module>grizzly-optionals</module>
</modules>
<build>
<plugins>
Modified: trunk/v3/embedded/api/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/embedded/api/pom.xml?view=diff&rev=24270&p1=trunk/v3/embedded/api/pom.xml&p2=trunk/v3/embedded/api/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/embedded/api/pom.xml (original)
+++ trunk/v3/embedded/api/pom.xml 2009-01-12 15:07:13+0000
@@ -188,18 +188,18 @@
<!-- all in one launch -->
- <dependency>
- <groupId>org.glassfish.distributions</groupId>
- <artifactId>web</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <exclusions>
- <exclusion>
- <groupId>org.glassfish.common</groupId>
- <artifactId>amx-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.glassfish.distributions</groupId>
+ <artifactId>web</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.common</groupId>
+ <artifactId>amx-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
@@ -210,11 +210,26 @@
<scope>provided</scope>
</dependency-->
- <dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.1</version>
- <scope>test</scope>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-framework</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
</dependencies>
Modified: trunk/v3/extras/grizzly-container/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/extras/grizzly-container/pom.xml?view=diff&rev=24270&p1=trunk/v3/extras/grizzly-container/pom.xml&p2=trunk/v3/extras/grizzly-container/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/extras/grizzly-container/pom.xml (original)
+++ trunk/v3/extras/grizzly-container/pom.xml 2009-01-12 15:07:13+0000
@@ -44,5 +44,10 @@
<artifactId>internal-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/v3/extras/phobos/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/extras/phobos/pom.xml?view=diff&rev=24270&p1=trunk/v3/extras/phobos/pom.xml&p2=trunk/v3/extras/phobos/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/extras/phobos/pom.xml (original)
+++ trunk/v3/extras/phobos/pom.xml 2009-01-12 15:07:13+0000
@@ -73,8 +73,9 @@
</build>
<dependencies>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.core</groupId>
Modified: trunk/v3/extras/php/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/extras/php/pom.xml?view=diff&rev=24270&p1=trunk/v3/extras/php/pom.xml&p2=trunk/v3/extras/php/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/extras/php/pom.xml (original)
+++ trunk/v3/extras/php/pom.xml 2009-01-12 15:07:13+0000
@@ -53,11 +53,22 @@
<artifactId>kernel</artifactId>
<version>${project.version}</version>
</dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-framework</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
+ <dependency>
<groupId>com.caucho</groupId>
<artifactId>quercus</artifactId>
<version>3.1</version>
Modified: trunk/v3/packager/glassfish-grizzly/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/packager/glassfish-grizzly/pom.xml?view=diff&rev=24270&p1=trunk/v3/packager/glassfish-grizzly/pom.xml&p2=trunk/v3/packager/glassfish-grizzly/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/packager/glassfish-grizzly/pom.xml (original)
+++ trunk/v3/packager/glassfish-grizzly/pom.xml 2009-01-12 15:07:13+0000
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-*
-* Copyright 1997-2007 Sun Microsystems, Inc. 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.html
-* or glassfish/bootstrap/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
glassfish/bootstrap/legal/LICENSE.txt.
-* Sun designates this particular file as subject to the "Classpath"
exception
-* as provided by Sun in the GPL Version 2 section of the License file that
-* accompanied this code. If applicable, add the following below the
License
-* Header, with the fields enclosed by brackets [] replaced by your own
-* identifying information: "Portions Copyrighted [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.
-*/
--->
+<!--
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 1997-2007 Sun Microsystems, Inc. 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.html
+* or glassfish/bootstrap/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
glassfish/bootstrap/legal/LICENSE.txt.
+* Sun designates this particular file as subject to the "Classpath"
exception
+* as provided by Sun in the GPL Version 2 section of the License file that
+* accompanied this code. If applicable, add the following below the
License
+* Header, with the fields enclosed by brackets [] replaced by your own
+* identifying information: "Portions Copyrighted [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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -81,7 +81,7 @@
</if>
<ant dir="." antfile="build.xml"
target="create.package"/>
</tasks>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -90,16 +90,57 @@
<dependencies>
<!--
modules to be included in this bundle
- -->
+ -->
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-optionals</artifactId>
- </dependency>
-
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-framework</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-portunif</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-rcm</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-compat</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-cometd</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-comet</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-messagesbus</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<profiles>
@@ -109,7 +150,7 @@
-->
<id>ips</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
@@ -134,7 +175,7 @@
</plugins>
</build>
</profile>
- </profiles>
+ </profiles>
<pluginRepositories>
<pluginRepository>
Modified: trunk/v3/packager/glassfish-scripting/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/packager/glassfish-scripting/pom.xml?view=diff&rev=24270&p1=trunk/v3/packager/glassfish-scripting/pom.xml&p2=trunk/v3/packager/glassfish-scripting/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/packager/glassfish-scripting/pom.xml (original)
+++ trunk/v3/packager/glassfish-scripting/pom.xml 2009-01-12 15:07:13+0000
@@ -76,7 +76,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeTransitive>false</excludeTransitive>
-
<excludeArtifactIds>grizzly-module,glassfish-api,stax-api,wstx-asl</excludeArtifactIds>
+
<excludeArtifactIds>glassfish-api,stax-api,wstx-asl</excludeArtifactIds>
<excludeTypes>pom</excludeTypes>
<excludeGroupIds>com.sun.enterprise</excludeGroupIds>
<includeScope>compile</includeScope>
Modified: trunk/v3/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/pom.xml?view=diff&rev=24270&p1=trunk/v3/pom.xml&p2=trunk/v3/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/pom.xml (original)
+++ trunk/v3/pom.xml 2009-01-12 15:07:13+0000
@@ -111,10 +111,10 @@
<deployment-api.version>1.2-rev-1</deployment-api.version>
<jaxrpc-api.version>1.1</jaxrpc-api.version>
<!-- When you change the following property, please change
grizzly.package-version as well -->
- <grizzly.original-version>1.9.1</grizzly.original-version>
+ <grizzly.original-version>1.9.3</grizzly.original-version>
<!-- A version string like 1.8.6-RC2 is treated differently by
OSGi, hence
we map it manually -->
- <grizzly.package-version>1.9.1</grizzly.package-version>
+ <grizzly.package-version>1.9.3</grizzly.package-version>
<jaxb-api.version>2.1</jaxb-api.version>
<jaxws-api.version>2.1</jaxws-api.version>
<jsr250-api.version>1.0</jsr250-api.version>
@@ -487,25 +487,13 @@
<artifactId>glassfish-api</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-optionals</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>${jsf-api.version}</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
<!-- End: Dependency management -->
Modified: trunk/v3/security/webintegration/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/security/webintegration/pom.xml?view=diff&rev=24270&p1=trunk/v3/security/webintegration/pom.xml&p2=trunk/v3/security/webintegration/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/security/webintegration/pom.xml (original)
+++ trunk/v3/security/webintegration/pom.xml 2009-01-12 15:07:13+0000
@@ -140,8 +140,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
</dependencies>
</project>
Modified: trunk/v3/synchronization/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/synchronization/pom.xml?view=diff&rev=24270&p1=trunk/v3/synchronization/pom.xml&p2=trunk/v3/synchronization/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/synchronization/pom.xml (original)
+++ trunk/v3/synchronization/pom.xml 2009-01-12 15:07:13+0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<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">
@@ -76,15 +76,20 @@
<artifactId>glassfish-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.common</groupId>
- <artifactId>amx-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.common</groupId>
+ <artifactId>amx-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/v3/web/tomcat-connector/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/web/tomcat-connector/pom.xml?view=diff&rev=24270&p1=trunk/v3/web/tomcat-connector/pom.xml&p2=trunk/v3/web/tomcat-connector/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/web/tomcat-connector/pom.xml (original)
+++ trunk/v3/web/tomcat-connector/pom.xml 2009-01-12 15:07:13+0000
@@ -174,6 +174,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
</dependencies>
Modified: trunk/v3/web/web-ajp/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/web/web-ajp/pom.xml?view=diff&rev=24270&p1=trunk/v3/web/web-ajp/pom.xml&p2=trunk/v3/web/web-ajp/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/web/web-ajp/pom.xml (original)
+++ trunk/v3/web/web-ajp/pom.xml 2009-01-12 15:07:13+0000
@@ -94,5 +94,15 @@
<artifactId>web-core</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/v3/web/web-core/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/web/web-core/pom.xml?view=diff&rev=24270&p1=trunk/v3/web/web-core/pom.xml&p2=trunk/v3/web/web-core/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/web/web-core/pom.xml (original)
+++ trunk/v3/web/web-core/pom.xml 2009-01-12 15:07:13+0000
@@ -84,8 +84,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.common</groupId>
Modified: trunk/v3/web/web-glue/pom.xml
Url:
https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/web/web-glue/pom.xml?view=diff&rev=24270&p1=trunk/v3/web/web-glue/pom.xml&p2=trunk/v3/web/web-glue/pom.xml&r1=24269&r2=24270
==============================================================================
--- trunk/v3/web/web-glue/pom.xml (original)
+++ trunk/v3/web/web-glue/pom.xml 2009-01-12 15:07:13+0000
@@ -115,11 +115,11 @@
</resources>
</build>
<dependencies>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>web-cli</artifactId>
@@ -193,8 +193,9 @@
-->
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>grizzly-module</artifactId>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-utils</artifactId>
+ <version>${grizzly.original-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe_at_glassfish-svn.dev.java.net
For additional commands, e-mail: commits-help_at_glassfish-svn.dev.java.net