11:45 a.m.
Author: charles.crouch(a)jboss.com
Date: 2008-11-10 12:45:38 -0500 (Mon, 10 Nov 2008)
New Revision: 39
Modified:
trunk/core/pom.xml
Log:
EMBJOPR-21 tell AS5 to ignore any metadata in our WEB-INF/lib jars
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2008-11-10 17:12:28 UTC (rev 38)
+++ trunk/core/pom.xml 2008-11-10 17:45:38 UTC (rev 39)
@@ -308,49 +308,6 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>de-ejb-domain-jar</id>
- <phase>package</phase>
- <goals><goal>run</goal></goals>
- <configuration>
- <tasks>
- <!-- Strip out the ejb-jar.xml and persistence.xml
from core domain jar,
- so AS5 will not try to deploy it as an EJB-JAR and
dump warnings
- about not being able to find an "RHQDS"
datasource. -->
-
- <!-- Extract the domain jar from the war. -->
- <property name="deEjb.tmpDir"
location="${basedir}/target/deEjb.tmp"/>
- <delete dir="${deEjb.tmpDir}"/>
- <mkdir dir="${deEjb.tmpDir}"/>
- <unwar
src="${basedir}/target/${project.build.finalName}.war"
- dest="${deEjb.tmpDir}">
- <patternset><include
name="WEB-INF/lib/rhq-core-domain-${rhq.version}.jar"/></patternset>
- </unwar>
-
- <!-- Delete ejb-jar.xml and persistence.xml from the
domain jar. -->
- <property name="domainJar.tmpDir"
location="${deEjb.tmpDir}/rhq-core-domain"/>
- <property name="domainJar"
location="${deEjb.tmpDir}/WEB-INF/lib/rhq-core-domain-${rhq.version}.jar"/>
- <mkdir dir="${domainJar.tmpDir}"/>
- <unzip dest="${domainJar.tmpDir}"
src="${domainJar}"/>
- <delete>
- <fileset dir="${domainJar.tmpDir}"
includes="META-INF/ejb-jar.xml,META-INF/persistence.xml"/>
- </delete>
- <delete file="${domainJar}"/>
- <zip destfile="${domainJar}"
basedir="${domainJar.tmpDir}"/>
-
- <!-- Stick the updated domain jar in the war. -->
- <war
destfile="${basedir}/target/${project.build.finalName}.war"
- basedir="${deEjb.tmpDir}"
- update="true"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>