Index: ejb-connector/osgi.bundle =================================================================== --- ejb-connector/osgi.bundle (revision 51598) +++ ejb-connector/osgi.bundle (working copy) @@ -39,9 +39,3 @@ # -exportcontents: org.glassfish.ejb; org.glassfish.ejb.config; version=${project.osgi.version} - -# See issue #10545 to know why we have explicitly added org.glassfish.apf.context -# in Import-Package -Import-Package: \ - org.glassfish.apf.context, \ - * Index: ejb-connector/pom.xml =================================================================== --- ejb-connector/pom.xml (revision 51598) +++ ejb-connector/pom.xml (working copy) @@ -87,11 +87,6 @@ ${project.version} - org.glassfish.deployment - dol - ${project.version} - - org.glassfish.hk2 hk2 Index: ejb-container/osgi.bundle =================================================================== --- ejb-container/osgi.bundle (revision 51598) +++ ejb-container/osgi.bundle (working copy) @@ -48,6 +48,8 @@ com.sun.ejb.spi.container; \ com.sun.appserv.ejb; version=${project.osgi.version} +# See issue #10545 to know why we have explicitly added org.glassfish.apf.context +# in Import-Package # Note that the CORBA and javax classes are needed so that dynamic RMI-IIOP # can create a stub for ReadOnlyEJBHome. Import-Package: \ @@ -65,6 +67,7 @@ org.omg.CORBA_2_3.portable;resolution:=optional, \ javax.rmi.CORBA;resolution:=optional, \ com.sun.corba.ee.impl.presentation.rmi.codegen;resolution:=optional, \ + org.glassfish.apf.context, \ * Bundle-SymbolicName: \ Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InterceptorsHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractAttributeHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/MessageDrivenHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeDefaultInterceptorsHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeClassInterceptorsHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/annotation/impl/EjbInWarScanner.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/EjbAnnotationTypesProvider.java (deleted) =================================================================== Index: ejb-connector/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java (deleted) =================================================================== Moved from ejb-connector to ejb-container: =================================================================== A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InterceptorsHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractAttributeHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/MessageDrivenHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeDefaultInterceptorsHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeClassInterceptorsHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java A + src/main/java/org/glassfish/ejb/deployment/annotation/impl/EjbInWarScanner.java A + src/main/java/org/glassfish/ejb/deployment/EjbAnnotationTypesProvider.java A + src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java