Author: gtully
Date: Mon Sep 14 14:02:43 2009
New Revision: 814648
URL: http://svn.apache.org/viewvc?rev=814648&view=rev
Log:
ensure generated xsd is available to test phase
Modified:
activemq/trunk/activemq-core/pom.xml
Modified: activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=814648&r1=814647&r2=814648&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Mon Sep 14 14:02:43 2009
@@ -531,7 +531,7 @@
<echo>Running the XSDDoc task</echo>
<taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
<mkdir dir="${basedir}/target/site/xsddoc" />
- <xsddoc file="${basedir}/target/xbean/activemq.xsd"
out="${basedir}/target/site/xsddoc" doctitle="Apache ActiveMQ XML Schema
Reference" header="<a href='http://activemq.apache.org/'>Apache
ActiveMQ</a>" footer="Copyright 2007 (c) the <a
href='http://www.apache.org/'>Apache Software Foundation</a>"
verbose="false" />
+ <xsddoc file="${basedir}/target/classes/activemq.xsd"
out="${basedir}/target/site/xsddoc" doctitle="Apache ActiveMQ XML Schema
Reference" header="<a href='http://activemq.apache.org/'>Apache
ActiveMQ</a>" footer="Copyright 2007 (c) the <a
href='http://www.apache.org/'>Apache Software Foundation</a>"
verbose="false" />
<!--
css="${basedir}/../etc/css/stylesheet.css"
-->
@@ -591,7 +591,8 @@
<phase>process-classes</phase>
<configuration>
<namespace>http://activemq.apache.org/schema/core</namespace>
- <schema>target/xbean/activemq.xsd</schema>
+ <schema>${basedir}/target/classes/activemq.xsd</schema>
+ <outputDir>${basedir}/target/classes</outputDir>
<generateSpringSchemasFile>false</generateSpringSchemasFile>
<excludedClasses>org.apache.activemq.broker.jmx.AnnotatedMBean,org.apache.activemq.broker.jmx.DestinationViewMBean</excludedClasses>
</configuration>
@@ -602,28 +603,6 @@
</executions>
</plugin>
- <!-- lets ensure that the XSD gets deployed -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>target/xbean</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>