On 4/11/13 7:00 AM, Tim Quinn wrote:
> Hi.
>
> These changes are part of the fix for http://java.net/jira/browse/GLASSFISH-19943
>
> I have pasted the diffs below. Basically we have to move a Java package - com.sun.appserv.security - and its classes from a nucleus module into an appserver module and we need to adjust two dependencies accordingly.
Looks good.
>
> Thanks.
>
> - Tim
>
>
> Index: main/appserver/common/glassfish-ee-api/osgi.bundle
> ===================================================================
> --- main/appserver/common/glassfish-ee-api/osgi.bundle (revision 61247)
> +++ main/appserver/common/glassfish-ee-api/osgi.bundle (working copy)
> @@ -40,4 +40,5 @@
>
> -exportcontents: \
> com.sun.appserv; \
> + com.sun.appserv.security; \
> com.sun.appserv.connectors.spi; version=${project.osgi.version}
> Index: main/appserver/common/glassfish-ee-api/pom.xml
> ===================================================================
> --- main/appserver/common/glassfish-ee-api/pom.xml (revision 61247)
> +++ main/appserver/common/glassfish-ee-api/pom.xml (working copy)
> @@ -89,6 +89,11 @@
> <artifactId>common-util</artifactId>
> <version>${project.version}</version>
> </dependency>
> + <dependency>
> + <groupId>org.glassfish.main.security</groupId>
> + <artifactId>security</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> </dependencies>
> </project>
>
> Index: main/appserver/security/core-ee/pom.xml
> ===================================================================
> --- main/appserver/security/core-ee/pom.xml (revision 61247)
> +++ main/appserver/security/core-ee/pom.xml (working copy)
> @@ -188,6 +188,11 @@
> <artifactId>security</artifactId>
> <version>${project.version}</version>
> </dependency>
> + <dependency> <!-- for AuditModule -->
> + <groupId>org.glassfish.main.common</groupId>
> + <artifactId>glassfish-ee-api</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> <dependency>
> <groupId>org.glassfish.hk2</groupId>
> <artifactId>core</artifactId>
> Index: main/nucleus/security/core/osgi.bundle
> ===================================================================
> --- main/nucleus/security/core/osgi.bundle (revision 61247)
> +++ main/nucleus/security/core/osgi.bundle (working copy)
> @@ -46,7 +46,6 @@
> com.sun.enterprise.security.auth.login; \
> com.sun.enterprise.security.factory; \
> com.iplanet.ias.security.auth.realm; \
> - com.sun.appserv.security; \
> com.sun.enterprise.security.auth.realm; \
> com.sun.enterprise.security.auth.realm.certificate; \
> com.sun.enterprise.security.auth.realm.file; \
>
>
>
>