tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1079604 - in /openejb/trunk/openejb3: container/openejb-core/pom.xml deps/javaee-api/pom.xml server/openejb-client/pom.xml
Date Tue, 08 Mar 2011 23:48:31 GMT
Author: djencks
Date: Tue Mar  8 23:48:31 2011
New Revision: 1079604

URL: http://svn.apache.org/viewvc?rev=1079604&view=rev
Log:
make mail osgi-optional for a couple modules, and assemble javaee-api using the maven-bundle-plugin
which gives better osgi metadata and is simpler

Modified:
    openejb/trunk/openejb3/container/openejb-core/pom.xml
    openejb/trunk/openejb3/deps/javaee-api/pom.xml
    openejb/trunk/openejb3/server/openejb-client/pom.xml

Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1079604&r1=1079603&r2=1079604&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Mar  8 23:48:31 2011
@@ -42,6 +42,7 @@
       org.quartz.*;resolution:=optional,
       javax.enterprise.deploy*;resolution:=optional,
       javax.jms*;resolution:=optional,
+      javax.mail*;resolution:=optional,
       javax.xml.registry*;resolution:=optional,
       javax.xml.rpc*;resolution:=optional,
       org.apache.activemq*;resolution:=optional,

Modified: openejb/trunk/openejb3/deps/javaee-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/javaee-api/pom.xml?rev=1079604&r1=1079603&r2=1079604&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/javaee-api/pom.xml (original)
+++ openejb/trunk/openejb3/deps/javaee-api/pom.xml Tue Mar  8 23:48:31 2011
@@ -26,81 +26,97 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>javaee-api</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>OpenEJB :: Dependencies :: JavaEE API</name>
   <version>6.0-SNAPSHOT</version>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.2</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <filters>
-                <filter>
-                  <artifact>org.apache.geronimo.specs:geronimo-ejb_3.1_spec</artifact>
-                  <includes>
-                    <include>javax/ejb/**</include>
-                  </includes>
-                </filter>
-              </filters>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <manifestEntries>
-                    <Export-Package>javax.xml, javax.xml.ws, javax.xml.ws.handler,
javax.xml.ws.handler.soap,
-                      javax.xml.ws.spi, javax.xml.ws.http, javax.xml.ws.soap,javax.xml.soap,
javax.xml.namespace,
-                      javax.xml.registry, javax.xml.registry.infomodel, javax.xml.rpc, javax.xml.rpc.encoding,
-                      javax.xml.rpc.handler, javax.xml.rpc.handler.soap, javax.xml.rpc.holders,
javax.xml.rpc.server,
-                      javax.xml.rpc.soap, javax.xml.stream, javax.xml.stream.events, javax.xml.stream.util,
-                      javax.xml.bind, javax.xml.bind.annotation, javax.xml.bind.annotation.adapters,
-                      javax.xml.bind.attachment, javax.xml.bind.helpers, javax.xml.bind.util,
javax.mail,
-                      javax.mail.event, javax.mail.internet, javax.mail.search, javax.mail.util,
javax.activation,
-                      javax.annotation, javax.annotation.security, javax.ejb, javax.ejb.spi,
javax.interceptor,
-                      javax.resource, javax.resource.cci, javax.resource.spi, javax.resource.spi.endpoint,
-                      javax.resource.spi.security, javax.resource.spi.work, javax.enterprise,
javax.enterprise.deploy,
-                      javax.enterprise.deploy.model, javax.enterprise.deploy.model.exceptions,
-                      javax.enterprise.deploy.shared, javax.enterprise.deploy.shared.factories,
-                      javax.enterprise.deploy.spi, javax.enterprise.deploy.spi.exceptions,
-                      javax.enterprise.deploy.spi.factories, javax.enterprise.deploy.spi.status,
javax.management,
-                      javax.management.j2ee, javax.management.j2ee.statistics, javax.security,
javax.security.jacc,
-                      javax.jms, javax.persistence, javax.persistence.spi, javax.transaction;version="5.0",
-                      javax.transaction.xa;version="5.0", javax.servlet, javax.servlet.http,
javax.servlet.resources,
-                      javax.jws, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail,
-                      org.apache.geronimo.mail.handlers, org.apache.geronimo.mail.util
-                    </Export-Package>
-                  </manifestEntries>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <unzip src="${project.build.directory}/javaee-api-${project.version}.jar"
-                       dest="${project.build.directory}/classes"/>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.4</version>
+        <executions  combine.self="override"/>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              javax.*,
+              org.apache.geronimo.mail.*
+            </Export-Package>
+            <Private-Package>org.apache.geronimo.osgi.locator.*</Private-Package>
+          </instructions>
+        </configuration>
+
       </plugin>
+      <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-shade-plugin</artifactId>-->
+        <!--<version>1.2</version>-->
+        <!--<executions>-->
+          <!--<execution>-->
+            <!--<phase>package</phase>-->
+            <!--<goals>-->
+              <!--<goal>shade</goal>-->
+            <!--</goals>-->
+            <!--<configuration>-->
+              <!--<filters>-->
+                <!--<filter>-->
+                  <!--<artifact>org.apache.geronimo.specs:geronimo-ejb_3.1_spec</artifact>-->
+                  <!--<includes>-->
+                    <!--<include>javax/ejb/**</include>-->
+                  <!--</includes>-->
+                <!--</filter>-->
+              <!--</filters>-->
+              <!--<transformers>-->
+                <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">-->
+                  <!--<manifestEntries>-->
+                    <!--<Export-Package>javax.xml, javax.xml.ws, javax.xml.ws.handler,
javax.xml.ws.handler.soap,-->
+                      <!--javax.xml.ws.spi, javax.xml.ws.http, javax.xml.ws.soap,javax.xml.soap,
javax.xml.namespace,-->
+                      <!--javax.xml.registry, javax.xml.registry.infomodel, javax.xml.rpc,
javax.xml.rpc.encoding,-->
+                      <!--javax.xml.rpc.handler, javax.xml.rpc.handler.soap, javax.xml.rpc.holders,
javax.xml.rpc.server,-->
+                      <!--javax.xml.rpc.soap, javax.xml.stream, javax.xml.stream.events,
javax.xml.stream.util,-->
+                      <!--javax.xml.bind, javax.xml.bind.annotation, javax.xml.bind.annotation.adapters,-->
+                      <!--javax.xml.bind.attachment, javax.xml.bind.helpers, javax.xml.bind.util,
javax.mail,-->
+                      <!--javax.mail.event, javax.mail.internet, javax.mail.search, javax.mail.util,
javax.activation,-->
+                      <!--javax.annotation, javax.annotation.security, javax.ejb, javax.ejb.spi,
javax.interceptor,-->
+                      <!--javax.resource, javax.resource.cci, javax.resource.spi, javax.resource.spi.endpoint,-->
+                      <!--javax.resource.spi.security, javax.resource.spi.work, javax.enterprise,
javax.enterprise.deploy,-->
+                      <!--javax.enterprise.deploy.model, javax.enterprise.deploy.model.exceptions,-->
+                      <!--javax.enterprise.deploy.shared, javax.enterprise.deploy.shared.factories,-->
+                      <!--javax.enterprise.deploy.spi, javax.enterprise.deploy.spi.exceptions,-->
+                      <!--javax.enterprise.deploy.spi.factories, javax.enterprise.deploy.spi.status,
javax.management,-->
+                      <!--javax.management.j2ee, javax.management.j2ee.statistics, javax.security,
javax.security.jacc,-->
+                      <!--javax.jms, javax.persistence, javax.persistence.spi, javax.transaction;version="5.0",-->
+                      <!--javax.transaction.xa;version="5.0", javax.servlet, javax.servlet.http,
javax.servlet.resources,-->
+                      <!--javax.jws, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail,-->
+                      <!--org.apache.geronimo.mail.handlers, org.apache.geronimo.mail.util-->
+                    <!--</Export-Package>-->
+                  <!--</manifestEntries>-->
+                <!--</transformer>-->
+              <!--</transformers>-->
+            <!--</configuration>-->
+          <!--</execution>-->
+        <!--</executions>-->
+      <!--</plugin>-->
+      <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-antrun-plugin</artifactId>-->
+        <!--<version>1.4</version>-->
+        <!--<executions>-->
+          <!--<execution>-->
+            <!--<phase>package</phase>-->
+            <!--<goals>-->
+              <!--<goal>run</goal>-->
+            <!--</goals>-->
+            <!--<configuration>-->
+              <!--<tasks>-->
+                <!--<unzip src="${project.build.directory}/javaee-api-${project.version}.jar"-->
+                       <!--dest="${project.build.directory}/classes"/>-->
+              <!--</tasks>-->
+            <!--</configuration>-->
+          <!--</execution>-->
+        <!--</executions>-->
+      <!--</plugin>-->
     </plugins>
   </build>
 

Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=1079604&r1=1079603&r2=1079604&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Tue Mar  8 23:48:31 2011
@@ -32,7 +32,9 @@
   <name>OpenEJB :: Server :: Client</name>
   <properties>
     <openejb.osgi.import.pkg>
-      javax.transaction;version="1.1",*
+      javax.transaction;version="1.1",
+      javax.mail.*;version="1.4";resolution:=optional,
+      *
     </openejb.osgi.import.pkg>
   </properties>
   <build>



Mime
View raw message