The osgi.bundle files removed from 'common' modules

Signed-off-by: David Matějček <david.matejcek@omnifish.ee> # Conflicts: # appserver/common/glassfish-naming/osgi.bundle
eclipse-ee4j · Jul 30, 2023 · a428ee8 · a428ee8
1 parent d6c3a3e
commit a428ee8
Show file tree

Hide file tree

Showing 23 changed files with 156 additions and 497 deletions.
diff --git a/appserver/common/amx-jakartaee/osgi.bundle b/appserver/common/amx-jakartaee/osgi.bundle
diff --git a/appserver/common/amx-jakartaee/pom.xml b/appserver/common/amx-jakartaee/pom.xml
@@ -66,4 +66,18 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/appserver/common/annotation-framework/osgi.bundle b/appserver/common/annotation-framework/osgi.bundle
diff --git a/appserver/common/annotation-framework/pom.xml b/appserver/common/annotation-framework/pom.xml
@@ -94,4 +94,18 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/appserver/common/container-common/osgi.bundle b/appserver/common/container-common/osgi.bundle
diff --git a/appserver/common/container-common/pom.xml b/appserver/common/container-common/pom.xml
@@ -132,5 +132,16 @@
                 </includes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/appserver/common/glassfish-naming/osgi.bundle b/appserver/common/glassfish-naming/osgi.bundle
diff --git a/appserver/common/glassfish-naming/pom.xml b/appserver/common/glassfish-naming/pom.xml
@@ -101,4 +101,26 @@
             <artifactId>hamcrest</artifactId>
         </dependency>
    </dependencies>
+
+   <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*</Export-Package>
+                        <Import-Package>
+                            com.sun.corba.ee.impl.presentation.rmi.codegen;resolution:=optional,
+                            javax.rmi.CORBA;resolution:=optional,
+                            org.omg.CORBA;resolution:=optional,
+                            org.omg.CORBA.portable;resolution:=optional,
+                            org.omg.CORBA_2_3.portable;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/...common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java b/...common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
  * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -49,7 +49,7 @@
 public class NamingUtilsImpl implements NamingUtils {
 
     @LogMessageInfo(
-        message = "Exception in NamingManagerImpl copyMutableObject(): {0}",
+        message = "Exception in NamingUtilsImpl copyMutableObject(): {0}",
         cause = "Problem with serialising or deserialising of the object",
         action = "Check the class hierarchy to see if all the classes are Serializable.")
     public static final String EXCEPTION_COPY_MUTABLE = "AS-NAMING-00006";
@@ -102,9 +102,8 @@ public <T> T makeCopyOfObject(T obj) {
                 return (T) AccessController.doPrivileged((PrivilegedExceptionAction<Object>) ois::readObject);
             }
         } catch (Exception ex) {
-            logger.log(Level.SEVERE, EXCEPTION_COPY_MUTABLE, ex);
-            RuntimeException re = new RuntimeException("Cant copy Serializable object:", ex);
-            throw re;
+            logger.log(Level.SEVERE, EXCEPTION_COPY_MUTABLE, obj);
+            throw new RuntimeException("Cant copy Serializable object " + obj, ex);
         }
     }
 }
diff --git a/appserver/common/stats77/osgi.bundle b/appserver/common/stats77/osgi.bundle
diff --git a/appserver/connectors/connectors-runtime/osgi.bundle b/appserver/connectors/connectors-runtime/osgi.bundle
diff --git a/appserver/deployment/dol/osgi.bundle b/appserver/deployment/dol/osgi.bundle
diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml
@@ -182,5 +182,16 @@
                 </includes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/appserver/security/core-ee/osgi.bundle b/appserver/security/core-ee/osgi.bundle