Return-Path: 
 <commits-return-6937-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org>
Delivered-To: apmail-openjpa-commits-archive@www.apache.org
Received: (qmail 33275 invoked from network); 21 Jul 2010 19:01:18 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 21 Jul 2010 19:01:18 -0000
Received: (qmail 87666 invoked by uid 500); 21 Jul 2010 19:01:18 -0000
Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org
Received: (qmail 87601 invoked by uid 500); 21 Jul 2010 19:01:18 -0000
Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openjpa.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openjpa.apache.org>
List-Post: <mailto:commits@openjpa.apache.org>
List-Id: <commits.openjpa.apache.org>
Reply-To: dev@openjpa.apache.org
Delivered-To: mailing list commits@openjpa.apache.org
Received: (qmail 87594 invoked by uid 99); 21 Jul 2010 19:01:18 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jul 2010 19:01:18 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jul 2010 19:01:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 22FA72388A36; Wed, 21 Jul 2010 19:00:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r966362 - /openjpa/branches/1.3.x/openjpa/pom.xml
Date: Wed, 21 Jul 2010 19:00:22 -0000
To: commits@openjpa.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100721190022.22FA72388A36@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Wed Jul 21 19:00:21 2010
New Revision: 966362

URL: http://svn.apache.org/viewvc?rev=966362&view=rev
Log:
OPENJPA-1737 Fix the openjpa bundle creation so MANIFEST.MF is the first artifact entry

Modified:
    openjpa/branches/1.3.x/openjpa/pom.xml

Modified: openjpa/branches/1.3.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/pom.xml?rev=966362&r1=966361&r2=966362&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa/pom.xml Wed Jul 21 19:00:21 2010
@@ -22,16 +22,19 @@
     the release plugin.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>openjpa</artifactId>
-    <packaging>bundle</packaging>
-    <name>OpenJPA Aggregate Jar</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <artifactId>openjpa</artifactId>
+    <packaging>bundle</packaging>
+    <name>OpenJPA Aggregate Jar</name>
+
     <build>
         <plugins>
             <!--
@@ -48,6 +51,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <!-- Create our aggregate JAR -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -86,45 +90,12 @@
                                  org.apache.openjpa.kernel.exps.ExpressionParser
                                 -->
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <!-- Need to add some MANIFEST.MF metadata -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <manifestEntries>
-                                        <Main-Class>org.apache.openjpa.conf.OpenJPAVersion</Main-Class>
-                                        <Premain-Class>org.apache.openjpa.enhance.PCEnhancerAgent</Premain-Class>
-                                        <Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
-                                        <Can-Redefine-Classes>true</Can-Redefine-Classes>
-                                        <Can-Retransform-Classes>true</Can-Retransform-Classes>
-                                        <Implementation-Title>Apache OpenJPA Aggregate JAR</Implementation-Title>
-                                        <Specification-Title>JSR-220 Java Persistence</Specification-Title>
-                                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-                                        <Specification-Version>1.0</Specification-Version>
-                                    </manifestEntries>
-                                </transformer>
                             </transformers>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
-            <!-- extract the shaded jar so a bundle can be created -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <unzip src="${project.build.directory}/${pom.artifactId}-${pom.version}.jar" dest="${project.build.directory}/classes"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- create an OSGi bundle -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -132,19 +103,21 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <!-- OpenJPA metadata -->
+                        <Main-Class>org.apache.openjpa.conf.OpenJPAVersion</Main-Class>
+                        <Premain-Class>org.apache.openjpa.enhance.PCEnhancerAgent</Premain-Class>
+                        <Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
+                        <Can-Redefine-Classes>true</Can-Redefine-Classes>
+                        <Can-Retransform-Classes>true</Can-Retransform-Classes>
+                        <Implementation-Title>Apache OpenJPA Aggregate JAR</Implementation-Title>
+                        <Specification-Title>JSR-220 Java Persistence</Specification-Title>
+                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+                        <Specification-Version>1.0</Specification-Version>
                         <!-- OSGi Bundle Metadata -->
                         <Bundle-DocURL>${project.url}</Bundle-DocURL>
                         <Private-Package />
                         <Export-Package>org.apache.openjpa.*;version=${pom.version}</Export-Package>
-                        <Import-Package>com.ibm.*;resolution:=optional,org.postg
-resql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apa
-che.log4j.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax
-.jms.*;resolution:=optional,javax.transaction.*;resolution:=optional,javax.valid
-ation.*;resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolu
-tion:=optional,*</Import-Package>
-                        <!-- Eclipse metadata -->
-                        <Eclipse-Autostart>false</Eclipse-Autostart>
-                        <Bundle-ClassPath>.</Bundle-ClassPath>
+                        <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,org.slf4j.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,javax.transaction.*;version="[1.1.0,1.2)";resolution:=optional,javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,javax.persistence.*;version="[1.1.0,2.1)",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>