Author: ataylor Date: 2011-04-12 15:41:43 -0400 (Tue, 12 Apr 2011) New Revision: 10496 Added: trunk/examples/src/main/resources/build.xml Removed: trunk/examples/build.xml Modified: trunk/build-hornetq.xml trunk/distribution/src/main/assembly/dep.xml trunk/examples/pom.xml Log: mavenised examples part 3 Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-12 19:33:16 UTC (rev 10495) +++ trunk/build-hornetq.xml 2011-04-12 19:41:43 UTC (rev 10496) @@ -443,7 +443,7 @@ <delete quiet="true"> <fileset dir="${logs.dir}" includes="*"/> </delete> - <ant antfile="${examples.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="examples/src/main/resources/build.xml" target="clean" inheritall="false"/> <ant antfile="build-thirdparty.xml" target="maven-install"> <property name="maven.opts" value="-f hornetq-rest/pom.xml"/> <property name="maven.goal" value="clean"/> Modified: trunk/distribution/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/src/main/assembly/dep.xml 2011-04-12 19:33:16 UTC (rev 10495) +++ trunk/distribution/src/main/assembly/dep.xml 2011-04-12 19:41:43 UTC (rev 10496) @@ -171,6 +171,16 @@ <unpack>false</unpack> </binaries> </moduleSet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.hornetq:hornetq-examples</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>examples</outputDirectory> + </binaries> + </moduleSet> </moduleSets> <fileSets> <fileSet> Deleted: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2011-04-12 19:33:16 UTC (rev 10495) +++ trunk/examples/build.xml 2011-04-12 19:41:43 UTC (rev 10496) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent"> - ]> - -<!-- =========================================================================================== --> -<!-- --> -<!-- JBoss, Home of Professional Open Source --> -<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated --> -<!-- by the @authors tag. See the copyright.txt in the distribution for a --> -<!-- full listing of individual contributors. --> -<!-- --> -<!-- This is free software; you can redistribute it and/or modify it --> -<!-- under the terms of the GNU Lesser General Public License as --> -<!-- published by the Free Software Foundation; either version 2.1 of --> -<!-- the License, or (at your option) any later version. --> -<!-- --> -<!-- This software is distributed in the hope that it will be useful, --> -<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of --> -<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --> -<!-- Lesser General Public License for more details. --> -<!-- --> -<!-- You should have received a copy of the GNU Lesser General Public --> -<!-- License along with this software; if not, write to the Free --> -<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA --> -<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<!-- --> -<!-- =========================================================================================== --> - - -<project default="clean" name="examples" basedir="."> - <target name="clean"> - <subant target="clean" failonerror="true"> - <fileset dir="." excludes="build.xml" includes="**/build.xml" /> - </subant> - </target> -</project> Modified: trunk/examples/pom.xml =================================================================== --- trunk/examples/pom.xml 2011-04-12 19:33:16 UTC (rev 10495) +++ trunk/examples/pom.xml 2011-04-12 19:41:43 UTC (rev 10496) @@ -25,14 +25,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.2</version> - <configuration> - <archive> - <manifestEntries> - <HornetQ-Version>${HornetQ-Version}</HornetQ-Version> - <HornetQ-SVN-URL>${HornetQ-SVN-URL}</HornetQ-SVN-URL> - </manifestEntries> - </archive> - </configuration> </plugin> </plugins> </build> Copied: trunk/examples/src/main/resources/build.xml (from rev 10493, trunk/examples/build.xml) =================================================================== --- trunk/examples/src/main/resources/build.xml (rev 0) +++ trunk/examples/src/main/resources/build.xml 2011-04-12 19:41:43 UTC (rev 10496) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent"> + ]> + +<!-- =========================================================================================== --> +<!-- --> +<!-- JBoss, Home of Professional Open Source --> +<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated --> +<!-- by the @authors tag. See the copyright.txt in the distribution for a --> +<!-- full listing of individual contributors. --> +<!-- --> +<!-- This is free software; you can redistribute it and/or modify it --> +<!-- under the terms of the GNU Lesser General Public License as --> +<!-- published by the Free Software Foundation; either version 2.1 of --> +<!-- the License, or (at your option) any later version. --> +<!-- --> +<!-- This software is distributed in the hope that it will be useful, --> +<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of --> +<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --> +<!-- Lesser General Public License for more details. --> +<!-- --> +<!-- You should have received a copy of the GNU Lesser General Public --> +<!-- License along with this software; if not, write to the Free --> +<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA --> +<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> +<!-- --> +<!-- =========================================================================================== --> + + +<project default="clean" name="examples" basedir="../../../"> + <target name="clean"> + <subant target="clean" failonerror="true"> + <fileset dir="../../../" excludes="build.xml" includes="**/build.xml" /> + </subant> + </target> +</project>