Author: rmannibucau
Date: Thu Jan 5 15:15:39 2012
New Revision: 1227629
URL: http://svn.apache.org/viewvc?rev=1227629&view=rev
Log:
using a shade of openejb-core for openejb-core-osgi since it lets us filter
client packages and should ease the imports management
Modified:
openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?rev=1227629&r1=1227628&r2=1227629&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Thu Jan 5 15:15:39
2012
@@ -191,6 +191,38 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>org.apache.openejb:openejb-core</artifact>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/openejb/client/**</exclude>
+ <exclude>org/openejb/client/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <artifactSet>
+ <includes>
+ <include>org.apache.openejb:openejb-core</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified:
openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml?rev=1227629&r1=1227628&r2=1227629&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
(original)
+++ openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml Thu
Jan 5 15:15:39 2012
@@ -71,7 +71,7 @@
<bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle>
</feature>
- <feature name="openejb-core-dep" version="${project.version}">
+ <feature name="openejb-core" version="${project.version}">
<feature version="${javaee-api.version}">javaee-api</feature>
<!-- that shoudn't be necessary as we already have a stax bundle in
javaee-api,
@@ -109,13 +109,12 @@
<bundle>mvn:org.apache.openejb/openejb-javaagent/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-jee/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-loader/${project.version}</bundle>
-
<bundle>mvn:org.apache.openejb/openejb-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-karaf-commands/${project.version}</bundle>
</feature>
<feature name="openejb-core" version="${project.version}">
<feature version="${project.version}">openejb-core-dep</feature>
- <bundle>mvn:org.apache.openejb/openejb-core/${project.version}</bundle>
+
<bundle>mvn:org.apache.openejb/openejb-core-osgi/${project.version}</bundle>
</feature>
@@ -124,6 +123,6 @@
<bundle>mvn:org.apache.openejb/openejb-ejbd/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-server/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-client/${project.version}</bundle>
- <bundle>mvn:org.apache.openejb/openejb-core/${project.version}</bundle>
<!-- after openejb-client -->
+
<bundle>mvn:org.apache.openejb/openejb-core-osgi/${project.version}</bundle>
<!-- after openejb-client -->
</feature>
</features>
