svn commit: r737803 - in /openejb/trunk/openejb3/deps: ./ commons-dbcp-all/ javaee-api/pom.xml pom.xml

[db...@apache.org]

Author: dblevins
Date: Mon Jan 26 19:54:02 2009
New Revision: 737803

URL: http://svn.apache.org/viewvc?rev=737803&view=rev
Log:
Added the javaee-api dep from 3.0-beta-2.  
Applied patch from Oliver Guenther, OPENEJB-963: Enhance the javaee-api with OSGi Bundle Information
Thanks, Oliver!

Added:
    openejb/trunk/openejb3/deps/
      - copied from r737797, openejb/tags/openejb-3.0-beta-2/deps/
Removed:
    openejb/trunk/openejb3/deps/commons-dbcp-all/
Modified:
    openejb/trunk/openejb3/deps/javaee-api/pom.xml
    openejb/trunk/openejb3/deps/pom.xml

Modified: openejb/trunk/openejb3/deps/javaee-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/javaee-api/pom.xml?rev=737803&r1=737797&r2=737803&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/javaee-api/pom.xml (original)
+++ openejb/trunk/openejb3/deps/javaee-api/pom.xml Mon Jan 26 19:54:02 2009
@@ -20,21 +20,20 @@
   <parent>
     <artifactId>deps</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>3.0-beta-2</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>javaee-api</artifactId>
   <packaging>jar</packaging>
   <name>OpenEJB :: Dependencies :: JavaEE API</name>
-  <version>5.0-1</version>
-
+  <version>5.0-2</version>
 
   <build>
-    <plugins>
+    <plugins>  
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.0-beta-1</version>
+        <version>1.2</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -50,6 +49,18 @@
                   </includes>
                 </filter>
               </filters>
+		<transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+	        <Bundle-Name>${artifactId}</Bundle-Name>
+	        <Bundle-SymbolicName>${openejb.osgi.symbolic.name}</Bundle-SymbolicName>
+	        <Implementation-Title>Apache OpenEJB</Implementation-Title>
+	        <Implementation-Version>${project.version}</Implementation-Version>
+	        <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, javax.transaction.xa, 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>
@@ -292,4 +303,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
\ No newline at end of file

Modified: openejb/trunk/openejb3/deps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/pom.xml?rev=737803&r1=737797&r2=737803&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/pom.xml (original)
+++ openejb/trunk/openejb3/deps/pom.xml Mon Jan 26 19:54:02 2009
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>3.0-beta-2</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deps</artifactId>
@@ -28,7 +28,6 @@
   <name>OpenEJB :: Dependencies</name>
 
   <modules>
-    <module>commons-dbcp-all</module>
     <module>javaee-api</module>
   </modules>
 </project>