The osgi.bundle files removed from 'ejb' modules and web-glue

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Jul 30, 2023 · afea349 · afea349
1 parent 0b18fb7
commit afea349
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 177 deletions.
diff --git a/appserver/ejb/ejb-client/osgi.bundle b/appserver/ejb/ejb-client/osgi.bundle
diff --git a/appserver/ejb/ejb-connector/osgi.bundle b/appserver/ejb/ejb-connector/osgi.bundle
diff --git a/appserver/ejb/ejb-container/osgi.bundle b/appserver/ejb/ejb-container/osgi.bundle
diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml
@@ -235,6 +235,37 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            com.sun.ejb,
+                            com.sun.ejb.codegen,
+                            com.sun.ejb.containers,
+                            com.sun.ejb.containers.util,
+                            com.sun.ejb.containers.util.cache,
+                            com.sun.ejb.containers.util.pool,
+                            com.sun.ejb.monitoring.probes,
+                            com.sun.ejb.monitoring.stats,
+                            com.sun.ejb.spi.container,
+                            org.glassfish.ejb.deployment.annotation.handlers,
+                            org.glassfish.ejb.deployment.descriptor,
+                            org.glassfish.ejb.deployment.descriptor.runtime
+                        </Export-Package>
+                        <!-- These packages are not required and unavailable in glassfish-web distribution -->
+                        <Import-Package>
+                            jakarta.xml.soap;resolution:=optional,
+                            jakarta.xml.ws;resolution:=optional,
+                            jakarta.xml.ws.handler;resolution:=optional,
+                            jakarta.jws;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
            <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>

diff --git a/appserver/ejb/ejb-full-container/osgi.bundle b/appserver/ejb/ejb-full-container/osgi.bundle
diff --git a/appserver/web/web-glue/osgi.bundle b/appserver/web/web-glue/osgi.bundle
diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml
@@ -230,5 +230,50 @@
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                        com.sun.appserv.web.cache,
+                        com.sun.appserv.web.cache.filter,
+                        com.sun.appserv.web.cache.mapping,
+                        com.sun.appserv.web.taglibs.cache,
+                        com.sun.enterprise.security.web,
+                        com.sun.enterprise.util.logging,
+                        com.sun.enterprise.web,
+                        com.sun.enterprise.web.accesslog,
+                        com.sun.enterprise.web.connector.coyote,
+                        com.sun.enterprise.web.connector.extension,
+                        com.sun.enterprise.web.deploy,
+                        com.sun.enterprise.web.jsp,
+                        com.sun.enterprise.web.logger,
+                        com.sun.enterprise.web.logging.pwc,
+                        com.sun.enterprise.web.monitor,
+                        com.sun.enterprise.web.monitor.impl,
+                        com.sun.enterprise.web.pluggable,
+                        com.sun.enterprise.web.pwc,
+                        com.sun.enterprise.web.pwc.connector.coyote,
+                        com.sun.enterprise.web.reconfig,
+                        com.sun.enterprise.web.session,
+                        com.sun.enterprise.web.stats,
+                        com.sun.enterprise.web.util,
+                        com.sun.web.server,
+                        org.glassfish.web,
+                        org.glassfish.web.deployment.archivist,
+                        org.glassfish.web.deployment.descriptor,
+                        org.glassfish.web.deployment.io,
+                        org.glassfish.web.deployment.io.runtime,
+                        org.glassfish.web.deployment.runtime,
+                        org.glassfish.web.deployment.util,
+                        org.glassfish.web.deployment.xml,
+                        org.glassfish.web.deployment.node.runtime.wls
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>