Re: pom.xml and osgi.bundle review request

From: Sudarsan Sridhar <Sudarsan.Sridhar_at_Sun.COM>
Date: Thu, 09 Sep 2010 13:56:13 +0530

On 09-Sep-2010, at 1:40 PM, Sanjeeb Sahoo wrote:

> How come you have a package called com.sun.enterprise.server.pluggable in security code which does not contain security in its name? Is that belonging to multiple jar files?

This package is a retains the name from a legacy v2 package. This package was initially in security/core. Now it is moved into the new module. It contains just one Contract (SecuritySupport).

Regards,
Sudarsan

>
> Sahoo
> On Thursday 09 September 2010 01:35 PM, Sudarsan Sridhar wrote:
>>
>> The following changes are required in order to introduce a new module for handling SSL stores. This is being done in order to fix the performance bug: 13278
>>
>> Regards,
>> Sudarsan
>>
>> Index: security/pom.xml
>> ===================================================================
>> --- security/pom.xml (revision 40596)
>> +++ security/pom.xml (working copy)
>> @@ -56,6 +56,7 @@
>> <name>GlassFish Security Infrastructure and Technology Integration Modules</name>
>> <modules>
>> <module>webintegration</module>
>> + <module>ssl-impl</module>
>> <module>core</module>
>> <module>security-all</module>
>> <module>inmemory.jacc.provider</module>
>> @@ -64,5 +65,5 @@
>> <module>webservices.security</module>
>> <module>ejb.security</module>
>> <module>appclient.security</module>
>> - </modules>
>> -</project>
>> + </modules>
>> +</project>
>> \ No newline at end of file
>> Index: security/core/pom.xml
>> ===================================================================
>> --- security/core/pom.xml (revision 40596)
>> +++ security/core/pom.xml (working copy)
>> @@ -221,6 +221,11 @@
>> <version>${project.version}</version>
>> </dependency>
>> <dependency>
>> + <groupId>org.glassfish.security</groupId>
>> + <artifactId>ssl-impl</artifactId>
>> + <version>${project.version}</version>
>> + </dependency>
>> + <dependency>
>> <groupId>org.glassfish.deployment</groupId>
>> <artifactId>deployment-common</artifactId>
>> <version>${project.version}</version>
>> Index: security/core/osgi.bundle
>> ===================================================================
>> --- security/core/osgi.bundle (revision 40596)
>> +++ security/core/osgi.bundle (working copy)
>> @@ -68,8 +68,7 @@
>> com.sun.enterprise.security.auth.login.common; \
>> com.sun.enterprise.security.common; \
>> com.sun.logging.enterprise.system.core.security; \
>> - com.sun.enterprise.security.ssl; \
>> - com.sun.enterprise.server.pluggable; version=${project.osgi.version}
>> + com.sun.enterprise.security.ssl; version=${project.osgi.version}
>> Bundle-NativeCode: \
>> libsolsparcauth.so ; \
>> osname=SunOS ; \
>> Index: security/ssl-impl/pom.xml
>> ===================================================================
>> --- security/ssl-impl/pom.xml (revision 0)
>> +++ security/ssl-impl/pom.xml (revision 0)
>> @@ -0,0 +1,83 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +
>> +
>> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
>> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
>> + <modelVersion>4.0.0</modelVersion>
>> + <parent>
>> + <artifactId>securitymodule</artifactId>
>> + <groupId>org.glassfish.security</groupId>
>> + <version>3.1-SNAPSHOT</version>
>> + </parent>
>> + <groupId>org.glassfish.security</groupId>
>> + <artifactId>ssl-impl</artifactId>
>> + <packaging>hk2-jar</packaging>
>> + <version>3.1-SNAPSHOT</version>
>> + <name>GlassFish SSL Implementation Module</name>
>> + <developers>
>> + <developer>
>> + <id>nasradu8</id>
>> + <name>Sudarsan Sridhar</name>
>> + <organization>Sun Microsystems, Inc.</organization>
>> + <roles>
>> + <role>developer</role>
>> + </roles>
>> + </developer>
>> + </developers>
>> + <dependencies>
>> + <dependency>
>> + <groupId>org.glassfish.common</groupId>
>> + <artifactId>internal-api</artifactId>
>> + <version>${project.version}</version>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.glassfish.common</groupId>
>> + <artifactId>common-util</artifactId>
>> + <version>${project.version}</version>
>> + </dependency>
>> + <dependency>
>> + <groupId>com.sun.enterprise</groupId>
>> + <artifactId>hk2</artifactId>
>> + </dependency>
>> + </dependencies>
>> +</project>
>>
>> Index: security/ssl-impl/osgi.bundle
>> ===================================================================
>> --- security/ssl-impl/osgi.bundle (revision 0)
>> +++ security/ssl-impl/osgi.bundle (revision 0)
>> @@ -0,0 +1,43 @@
>> +#
>> +# 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.
>> +#
>> +
>> +-exportcontents: \
>> + com.sun.enterprise.security.ssl.manager; \
>> + com.sun.enterprise.server.pluggable; version=${project.osgi.version}
>> \ No newline at end of file
>>
>