Skip to content

Commit

Permalink
The osgi.bundle files removed from 'persistence' modules
Browse files Browse the repository at this point in the history 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
@dmatej
dmatej committed Jul 30, 2023
1 parent 54155c3 commit d417387
Show file tree
Hide file tree
Showing 18 changed files with 121 additions and 249 deletions.
20 changes: 0 additions & 20 deletions appserver/persistence/cmp/ejb-mapping/osgi.bundle
View file

This file was deleted.

21 changes: 0 additions & 21 deletions appserver/persistence/cmp/enhancer/osgi.bundle
View file

This file was deleted.

14 changes: 14 additions & 0 deletions appserver/persistence/cmp/enhancer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,20 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
com.sun.jdo.api.persistence.enhancer.generator,
com.sun.jdo.api.persistence.enhancer.meta
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<!--
Expand Down
20 changes: 0 additions & 20 deletions appserver/persistence/cmp/generator-database/osgi.bundle
View file

This file was deleted.

23 changes: 0 additions & 23 deletions appserver/persistence/cmp/model/osgi.bundle
View file

This file was deleted.

21 changes: 21 additions & 0 deletions appserver/persistence/cmp/model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,26 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<!--
impl packages would not be exported by default
util package is not exported
-->
<Export-Package>
com.sun.jdo.api.persistence.model,
com.sun.jdo.api.persistence.model.jdo,
com.sun.jdo.api.persistence.model.jdo.impl,
com.sun.jdo.api.persistence.model.mapping,
com.sun.jdo.api.persistence.model.mapping.impl
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
26 changes: 0 additions & 26 deletions appserver/persistence/cmp/support-ejb/osgi.bundle
View file

This file was deleted.

23 changes: 23 additions & 0 deletions appserver/persistence/cmp/support-ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,29 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<!--
com.sun.jdo.spi.persistence.support.ejb.cmp and com.sun.jdo.spi.persistence.support.ejb.ejbc
are exported because classes from these packages need to be visible to generated
*ConcreteImpl classes.
com.sun.jdo.spi.persistence.support.ejb.codegen.CMPDeployerImpl is referred from EJBDeployer.
However, the package need not be exported because the class is looked up through habitat
which uses bundle.loadClass() bypassing OSGI com.sun.jdo.spi.persistence.support.ejb.ejbqlc
is needed by verifier.
-->
<Export-Package>
com.sun.jdo.spi.persistence.support.ejb.cmp,
com.sun.jdo.spi.persistence.support.ejb.ejbc,
com.sun.jdo.spi.persistence.support.ejb.ejbqlc
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
22 changes: 0 additions & 22 deletions appserver/persistence/cmp/support-sqlstore/osgi.bundle
View file

This file was deleted.

14 changes: 14 additions & 0 deletions appserver/persistence/cmp/support-sqlstore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,20 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
com.sun.jdo.spi.persistence.support.sqlstore,
com.sun.jdo.spi.persistence.support.sqlstore.ejb,
com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc,
com.sun.jdo.spi.persistence.support.sqlstore.utility
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
22 changes: 0 additions & 22 deletions appserver/persistence/cmp/utility/osgi.bundle
View file

This file was deleted.

19 changes: 0 additions & 19 deletions appserver/persistence/common/osgi.bundle
View file

This file was deleted.

42 changes: 0 additions & 42 deletions appserver/persistence/entitybean-container/osgi.bundle
View file

This file was deleted.

27 changes: 27 additions & 0 deletions appserver/persistence/entitybean-container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,31 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
com.sun.appserv.ejb,
org.glassfish.persistence.ejb.entitybean.container.spi
</Export-Package>
<DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
<Import-Package>
com.sun.corba.ee.impl.presentation.rmi.codegen;resolution:=optional,
com.sun.corba.ee.spi.presentation.rmi;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>
17 changes: 0 additions & 17 deletions appserver/persistence/gf-jpa-connector/osgi.bundle
View file

This file was deleted.

11 changes: 11 additions & 0 deletions appserver/persistence/gf-jpa-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,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>
Loading

0 comments on commit d417387

Please sign in to comment.