Fixed Felix configuration

- CORBA is not a part of the JDK any more

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

csiv2-idl/pom.xml

@@ -64,11 +64,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>com.sun.corba.ee.org.omg.*</Export-Package>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

internal-api/pom.xml

@@ -58,7 +58,9 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>com.sun.corba.ee.spi.threadpool;version=1, com.sun.corba.ee.impl.threadpool;version=1, com.sun.corba.ee.spi.logex.stdcorba;version=1</Export-Package>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <!-- ThreadPoolImpl is used by glassfish-corba-orb -->
+                        <Export-Package>*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

omgapi/pom.xml

@@ -64,13 +64,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>org.omg.*; version=1, com.sun.*;version=1, javax.rmi;version=1, javax.rmi.CORBA;version=1</Export-Package>
-                        <Import-Package>!org.omg.PortableServer.ServantLocatorPackage</Import-Package>
-                        <Fragment-Host>system.bundle; extension:=framework</Fragment-Host>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

orbmain/pom.xml

@@ -105,27 +105,25 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            !com.sun.corba.ee.spi.threadpool, !com.sun.corba.ee.spi.logex.stdcorba,
-                            com.sun.corba.ee.spi.*; version=1,
-                            com.sun.corba.ee.impl.corba; version=1,
-                            com.sun.corba.ee.impl.encoding.*; version=1,
-                            com.sun.corba.ee.impl.folb; version=1,
-                            com.sun.corba.ee.impl.javax.*; version=1,
-                            com.sun.corba.ee.impl.misc; version=1,
-                            com.sun.corba.ee.impl.naming.*; version=1,
-                            com.sun.corba.ee.impl.oa.*; version=1,
-                            com.sun.corba.ee.impl.orb; version=1,
-                            com.sun.corba.ee.impl.presentation.*; version=1,
-                            com.sun.corba.ee.impl.txpoa; version=1,
-                            com.sun.corba.ee.impl.util; version=1,
-                            org.glassfish.jndi.*; version=1
+                            com.sun.corba.ee.spi.*,
+                            com.sun.corba.ee.impl.corba,
+                            com.sun.corba.ee.impl.encoding.*,
+                            com.sun.corba.ee.impl.folb,
+                            com.sun.corba.ee.impl.javax.*,
+                            com.sun.corba.ee.impl.misc,
+                            com.sun.corba.ee.impl.naming.*,
+                            com.sun.corba.ee.impl.oa.*,
+                            com.sun.corba.ee.impl.orb,
+                            com.sun.corba.ee.impl.presentation.*,
+                            com.sun.corba.ee.impl.txpoa,
+                            com.sun.corba.ee.impl.util,
+                            org.glassfish.jndi.*
                         </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
-            
+
             <!-- generate test idl -->
-            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>idlj-maven-plugin</artifactId>
@@ -140,7 +138,10 @@
                     <sources>
                         <source>
                             <packagePrefixes>
-                                <packagePrefix><type>interceptors</type><prefix>com.sun.corba.ee.impl</prefix></packagePrefix>
+                                <packagePrefix>
+                                    <type>interceptors</type>
+                                    <prefix>com.sun.corba.ee.impl</prefix>
+                                </packagePrefix>
                             </packagePrefixes>
                         </source>
                     </sources>

pom.xml

@@ -250,8 +250,6 @@
                         <execution>
                             <goals>
                                 <goal>manifest</goal>
-                                <goal>install</goal>
-                                <goal>deploy</goal>
                             </goals>
                         </execution>
                     </executions>

rmic/pom.xml

@@ -67,19 +67,12 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <configuration combine.self="override">
+                <configuration>
                     <archive>
                         <manifest>
                             <mainClass>org.glassfish.rmic.Main</mainClass>
                         </manifest>
-                        <manifestEntries>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>Eclipse Foundation</Implementation-Vendor>
-                        </manifestEntries>
                     </archive>
-                    <instructions>
-                        <Export-Package>org.glassfish.rmic.*</Export-Package>
-                    </instructions>
                 </configuration>
             </plugin>
         </plugins>