The osgi.bundle files removed from 'admin' modules

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

Hide file tree

Showing 17 changed files with 114 additions and 261 deletions.
diff --git a/appserver/admin/admin-core/osgi.bundle b/appserver/admin/admin-core/osgi.bundle
diff --git a/appserver/admin/backup/osgi.bundle b/appserver/admin/backup/osgi.bundle
diff --git a/...erver/admin/backup/src/main/java/com/sun/enterprise/config/backup/util/.gitkeep_empty_dir b/...erver/admin/backup/src/main/java/com/sun/enterprise/config/backup/util/.gitkeep_empty_dir
diff --git a/appserver/admin/cli-optional/osgi.bundle b/appserver/admin/cli-optional/osgi.bundle
diff --git a/nucleus/admin/cli/osgi.bundle b/nucleus/admin/cli/osgi.bundle
diff --git a/nucleus/admin/cli/pom.xml b/nucleus/admin/cli/pom.xml
@@ -168,6 +168,19 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            com.sun.enterprise.admin.cli,
+                            com.sun.enterprise.admin.cli.remote,
+                            com.sun.enterprise.admin.cli.schemadoc
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>

diff --git a/nucleus/admin/launcher/osgi.bundle b/nucleus/admin/launcher/osgi.bundle
diff --git a/nucleus/admin/rest/gf-restadmin-connector/osgi.bundle b/nucleus/admin/rest/gf-restadmin-connector/osgi.bundle
diff --git a/nucleus/admin/rest/gf-restadmin-connector/pom.xml b/nucleus/admin/rest/gf-restadmin-connector/pom.xml
@@ -52,27 +52,14 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <skip>true</skip>
+                    <instructions>
+                        <DynamicImport-Package>org.glassfish.api.admin.config</DynamicImport-Package>
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>rest-devtest</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/nucleus/admin/rest/rest-client/osgi.bundle b/nucleus/admin/rest/rest-client/osgi.bundle
diff --git a/nucleus/admin/rest/rest-client/pom.xml b/nucleus/admin/rest/rest-client/pom.xml
@@ -55,4 +55,32 @@
             <artifactId>jersey-media-multipart</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <DynamicImport-Package>
+                            com.sun.enterprise.security,
+                            com.sun.enterprise.security.auth.login,
+                            com.sun.enterprise.security.auth.realm,
+                            com.sun.enterprise.security.ssl,
+                            com.sun.enterprise.server.logging.logviewer.backend,
+                            jakarta.ws.rs,
+                            jakarta.ws.rs.core,
+                            jakarta.ws.rs.ext,
+                            org.glassfish.external.statistics,
+                            org.glassfish.external.statistics.impl,
+                            org.glassfish.flashlight,
+                            org.glassfish.flashlight.datatree
+                        </DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/nucleus/admin/rest/rest-service/osgi.bundle b/nucleus/admin/rest/rest-service/osgi.bundle
diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml
@@ -151,6 +151,34 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.glassfish.admin.rest,
+                            org.glassfish.admin.rest.adapter,
+                            org.glassfish.admin.rest.composite,
+                            org.glassfish.admin.rest.composite.metadata,
+                            org.glassfish.admin.rest.model,
+                            org.glassfish.admin.rest.resources.composite,
+                            org.glassfish.admin.rest.utils,
+                            org.glassfish.admin.rest.utils.xml,
+                            org.glassfish.admin.rest.wadl
+                        </Export-Package>
+                        <DynamicImport-Package>
+                            org.glassfish.flashlight,
+                            org.glassfish.flashlight.datatree
+                        </DynamicImport-Package>
+                        <Import-Package>
+                            !org.glassfish.admin.rest.resources.generatedASM,
+                            org.glassfish.jersey.gf.ejb.internal,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <!-- Test classes from this module are used elsewhere -->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/nucleus/admin/server-mgmt/osgi.bundle b/nucleus/admin/server-mgmt/osgi.bundle
diff --git a/nucleus/admin/server-mgmt/pom.xml b/nucleus/admin/server-mgmt/pom.xml
@@ -154,6 +154,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            com.sun.enterprise.admin.servermgmt,
+                            com.sun.enterprise.admin.servermgmt.pe,
+                            com.sun.enterprise.admin.servermgmt.services,
+                            com.sun.enterprise.admin.servermgmt.util
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/nucleus/admin/util/osgi.bundle b/nucleus/admin/util/osgi.bundle