Author: rhauch Date: 2008-05-06 18:25:58 -0400 (Tue, 06 May 2008) New Revision: 117 Added: trunk/build/ trunk/build/JBossORG-EULA.txt trunk/build/assembly/ trunk/build/assembly/dist.xml trunk/build/assembly/examples.xml trunk/build/assembly/javadoc.xml trunk/build/assembly/src.xml trunk/dna-common/src/main/java/org/jboss/dna/common/util/FileUtil.java trunk/docs/pom.xml Removed: trunk/dna-common/src/test/java/org/jboss/dna/common/util/FileUtil.java Modified: trunk/docs/ trunk/docs/examples/gettingstarted/sequencers/pom.xml trunk/docs/gettingstarted/pom.xml trunk/pom.xml Log: Added Maven assemblies that automate the production of the various distributable artifacts, including archives for sources, examples, javadoc and all. Added: trunk/build/JBossORG-EULA.txt =================================================================== --- trunk/build/JBossORG-EULA.txt (rev 0) +++ trunk/build/JBossORG-EULA.txt 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,106 @@ +LICENSE AGREEMENT +JBOSS(r) + +This License Agreement governs the use of the Software Packages and any updates to the Software +Packages, regardless of the delivery mechanism. Each Software Package is a collective work +under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to +the user ("Client") a license to the applicable collective work(s) pursuant to the +GNU Lesser General Public License v. 2.1 except for the following Software Packages: +(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the +GNU General Public License v.2; + +(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; + +(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the +(open source) Sleepycat License (if Client does not wish to use the open source version of this database, +it may purchase a license from Sleepycat Software); + +and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, +and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various +royalty-free patent licenses. + +Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. + +1. The Software. "Software Packages" refer to the various software modules that are created and made available +for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages +may be comprised of hundreds of software components. The end user license agreement for each component is located in +the component's source code. With the exception of certain image files identified in Section 2 below, +the license terms for the components permit Client to copy, modify, and redistribute the component, +in both source code and binary code forms. This agreement does not limit Client's rights under, +or grant Client rights that supersede, the license terms of any particular component. + +2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright +and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the +individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates +in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages +using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's +trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by +these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. +If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at +http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. +Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. + +3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular +component, to the maximum extent permitted under applicable law, the Software Packages and the +components are provided and licensed "as is" without warranty of any kind, expressed or implied, +including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. +Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in +materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. +Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements +or that the operation of the Software Packages will be entirely error free or appear precisely as described +in the accompanying documentation. This warranty extends only to the party that purchases the Services +pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. + +4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies +described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's +exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of +delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or +refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, +Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the use or inability to use the Software, +even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall +Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this +Agreement during the twelve months preceding the action. + +5. Export Control. As required by U.S. law, Client represents and warrants that it: +(a) understands that the Software Packages are subject to export controls under the +U.S. Commerce Department's Export Administration Regulations ("EAR"); + +(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations +(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); + +(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, +or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; + +(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or +biological weapons, or missile technology end-uses unless authorized by the U.S. Government by +regulation or specific license; + +(e) understands and agrees that if it is in the United States and exports or transfers the Software +Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual +reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and +address (including country) of each transferee; + +and (f) understands that countries other than the United States may restrict the import, use, or +export of encryption products and that it shall be solely responsible for compliance with any such +import, use, or export restrictions. + +6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages +that are not part of the Software Packages and which Client must install separately. These third party +programs are subject to their own license terms. The license terms either accompany the programs or +can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable +license terms for such programs, then Client may not install them. If Client wishes to install the programs +on more than one system or transfer the programs to another party, then Client must contact the licensor +of the programs. + +7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the +enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the +State of North Carolina and of the United States, without regard to any conflict of laws provisions, +except that the United Nations Convention on the International Sale of Goods shall not apply. + +Copyright 2006 Red Hat, Inc. All rights reserved. +"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. +All other trademarks are the property of their respective owners. + + Page 1 of 1 18 October 2006 Added: trunk/build/assembly/dist.xml =================================================================== --- trunk/build/assembly/dist.xml (rev 0) +++ trunk/build/assembly/dist.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,67 @@ +<assembly> + <id>dist</id> + <formats> + <!--<format>tar.gz</format> + <format>tar.bz2</format--> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <!-- + Gather into the distribution the various text files for inclusion + --> + <directory>build</directory> + <outputDirectory></outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> + <include>*.txt</include> + </includes> + </fileSet> + <fileSet> + <!-- + Gather into the distribution the JavaDoc for all projects + --> + <directory>target/site/apidocs</directory> + <outputDirectory>apidocs</outputDirectory> + </fileSet> + <fileSet> + <!-- + Gather into the distribution the Getting Started document + --> + <directory>docs/gettingstarted/target/docbook</directory> + <outputDirectory>manuals/gettingstarted</outputDirectory> + </fileSet> + </fileSets> + <moduleSets> + <moduleSet> + <!-- + Gather into the distribution the source, jars, and test-jars for all projects + --> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> + <directory>src</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*-${project.version}.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>lib/test</outputDirectory> + <includes> + <include>*-${project.version}-tests.jar</include> + </includes> + </fileSet> + </fileSets> + </sources> + </moduleSet> + </moduleSets> +</assembly> Added: trunk/build/assembly/examples.xml =================================================================== --- trunk/build/assembly/examples.xml (rev 0) +++ trunk/build/assembly/examples.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,31 @@ +<assembly> + <id>examples</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <!--<format>tar.gz</format> + <format>tar.bz2</format--> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <!-- + Gather into the distribution the various text files for inclusion + --> + <directory>build</directory> + <outputDirectory></outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> + <include>*.txt</include> + </includes> + </fileSet> + <fileSet> + <!-- + Gather into the distribution the examples + --> + <directory>docs/examples/gettingstarted/sequencers/target/dna-example-sequencers-basic.dir/</directory> + <outputDirectory>examples/sequencers</outputDirectory> + </fileSet> + </fileSets> +</assembly> Added: trunk/build/assembly/javadoc.xml =================================================================== --- trunk/build/assembly/javadoc.xml (rev 0) +++ trunk/build/assembly/javadoc.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,18 @@ +<assembly> + <id>javadoc</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <!--<format>tar.gz</format> + <format>tar.bz2</format--> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <!-- + Gather into the distribution the JavaDoc for all projects + --> + <directory>target/site/apidocs</directory> + <outputDirectory>apidocs</outputDirectory> + </fileSet> + </fileSets> +</assembly> Added: trunk/build/assembly/src.xml =================================================================== --- trunk/build/assembly/src.xml (rev 0) +++ trunk/build/assembly/src.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,21 @@ +<assembly> + <id>src</id> + <formats> + <!--<format>tar.gz</format> + <format>tar.bz2</format--> + <format>zip</format> + </formats> + <moduleSets> + <moduleSet> + <sources> + <fileSets> + <fileSet> + <excludes> + <exclude>target/**</exclude> + </excludes> + </fileSet> + </fileSets> + </sources> + </moduleSet> + </moduleSets> +</assembly> Copied: trunk/dna-common/src/main/java/org/jboss/dna/common/util/FileUtil.java (from rev 110, trunk/dna-common/src/test/java/org/jboss/dna/common/util/FileUtil.java) =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/util/FileUtil.java (rev 0) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/util/FileUtil.java 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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. + */ + +package org.jboss.dna.common.util; + +import java.io.File; + +public class FileUtil { + + /** + * Delete the file or directory at the supplied path. This method works on a directory that is not empty, unlike the + * {@link File#delete()} method. + * @param path the path to the file or directory that is to be deleted + * @return true if the file or directory at the supplied path existed and was successfully deleted, or false otherwise + */ + public static boolean delete( String path ) { + if (path == null || path.trim().length() == 0) return false; + return delete(new File(path)); + } + + /** + * Delete the file or directory given by the supplied reference. This method works on a directory that is not empty, unlike + * the {@link File#delete()} method. + * @param fileOrDirectory the reference to the Java File object that is to be deleted + * @return true if the supplied file or directory existed and was successfully deleted, or false otherwise + */ + public static boolean delete( File fileOrDirectory ) { + if (fileOrDirectory == null) return false; + if (!fileOrDirectory.exists()) return false; + + // The file/directory exists, so if a directory delete all of the contents ... + if (fileOrDirectory.isDirectory()) { + for (File childFile : fileOrDirectory.listFiles()) { + delete(childFile); // recursive call (good enough for now until we need something better) + } + // Now an empty directory ... + } + // Whether this is a file or empty directory, just delete it ... + return fileOrDirectory.delete(); + } + +} Deleted: trunk/dna-common/src/test/java/org/jboss/dna/common/util/FileUtil.java =================================================================== --- trunk/dna-common/src/test/java/org/jboss/dna/common/util/FileUtil.java 2008-05-06 16:12:11 UTC (rev 116) +++ trunk/dna-common/src/test/java/org/jboss/dna/common/util/FileUtil.java 2008-05-06 22:25:58 UTC (rev 117) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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. - */ - -package org.jboss.dna.common.util; - -import java.io.File; - -public class FileUtil { - - /** - * Delete the file or directory at the supplied path. This method works on a directory that is not empty, unlike the - * {@link File#delete()} method. - * @param path the path to the file or directory that is to be deleted - * @return true if the file or directory at the supplied path existed and was successfully deleted, or false otherwise - */ - public static boolean delete( String path ) { - if (path == null || path.trim().length() == 0) return false; - return delete(new File(path)); - } - - /** - * Delete the file or directory given by the supplied reference. This method works on a directory that is not empty, unlike - * the {@link File#delete()} method. - * @param fileOrDirectory the reference to the Java File object that is to be deleted - * @return true if the supplied file or directory existed and was successfully deleted, or false otherwise - */ - public static boolean delete( File fileOrDirectory ) { - if (fileOrDirectory == null) return false; - if (!fileOrDirectory.exists()) return false; - - // The file/directory exists, so if a directory delete all of the contents ... - if (fileOrDirectory.isDirectory()) { - for (File childFile : fileOrDirectory.listFiles()) { - delete(childFile); // recursive call (good enough for now until we need something better) - } - // Now an empty directory ... - } - // Whether this is a file or empty directory, just delete it ... - return fileOrDirectory.delete(); - } - -} Property changes on: trunk/docs ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/docs/examples/gettingstarted/sequencers/pom.xml =================================================================== --- trunk/docs/examples/gettingstarted/sequencers/pom.xml 2008-05-06 16:12:11 UTC (rev 116) +++ trunk/docs/examples/gettingstarted/sequencers/pom.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -24,6 +24,11 @@ </dependency> <dependency> <groupId>org.jboss.dna</groupId> + <artifactId>dna-common</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> <artifactId>dna-sequencer-images</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/docs/gettingstarted/pom.xml =================================================================== --- trunk/docs/gettingstarted/pom.xml 2008-05-06 16:12:11 UTC (rev 116) +++ trunk/docs/gettingstarted/pom.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -14,6 +14,6 @@ <artifactId>getting-started-${translation}</artifactId> <version>0.1-SNAPSHOT</version> <packaging>jdocbook</packaging> - <name>Getting_Started_(${translation})</name> + <name>JBoss DNA Getting Started Document (${translation})</name> </project> Added: trunk/docs/pom.xml =================================================================== --- trunk/docs/pom.xml (rev 0) +++ trunk/docs/pom.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -0,0 +1,17 @@ +<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"> + <parent> + <groupId>org.jboss.dna</groupId> + <artifactId>dna</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.dna.docs</groupId> + <artifactId>dna-docs</artifactId> + <packaging>pom</packaging> + <name>JBoss DNA Documents</name> + <url>http://www.jboss.org/dna</url> + <description>JBoss DNA Documentation</description> + <modules> + <module>gettingstarted</module> + </modules> +</project> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-05-06 16:12:11 UTC (rev 116) +++ trunk/pom.xml 2008-05-06 22:25:58 UTC (rev 117) @@ -5,17 +5,104 @@ <artifactId>dna</artifactId> <version>0.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>JBoss DNA Parent POM</name> - <url>http://labs.jboss.org/dna</url> - <description>JBoss DNA (aggregator)</description> + <name>JBoss DNA</name> + <url>http://www.jboss.org/dna</url> + <description>JBoss DNA provides tools for working with JCR repositories.</description> + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/dna/trunk</connectio... + </scm> <modules> <module>dna-common</module> <module>dna-spi</module> <module>dna-repository</module> <module>sequencers/dna-sequencer-images</module> <module>dna-maven-classloader</module> - <module>dna-integration-tests</module> </modules> + <properties> + <dna-version>0.1-SNAPSHOT</dna-version> + </properties> + <profiles> + <profile> + <!-- + This profile is activated when the "integration.tests" property is set, + as in "mvn ... -Dintegration.tests=true ..." + --> + <id>integration-tests</id> + <activation> + <property> + <name>integration.tests</name> + </property> + </activation> + <modules> + <module>dna-integration-tests</module> + </modules> + </profile> + <profile> + <!-- + This profile is activated when the "generate.docs" property is set, + as in "mvn ... -Dgenerate.docs=true ..." + --> + <id>docs</id> + <activation> + <property> + <name>generate.docs</name> + </property> + </activation> + <modules> + <module>docs</module> + </modules> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + <show>public</show> + <title>JBoss DNA ${project.version}</title> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + <profile> + <!-- + This profile is activated manually, as in "mvn ... -P assembly ..." + --> + <id>assembly</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>make-assembly</id> + <phase>install</phase> + <goals> + <goal>assembly</goal> + </goals> + </execution> + </executions> + <configuration> + <finalName>jboss-dna-${project.version}</finalName> + <descriptors> + <descriptor>build/assembly/examples.xml</descriptor> + <descriptor>build/assembly/javadoc.xml</descriptor> + <descriptor>build/assembly/dist.xml</descriptor> + <descriptor>build/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + <modules> + <module>dna-integration-tests</module> + <module>docs</module> + <module>docs/examples/gettingstarted</module> + </modules> + </profile> + </profiles> <build> <!-- This section defines the default plugin settings inherited by child projects. --> <pluginManagement> @@ -26,6 +113,14 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.2</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <configuration> + <aggregate>true</aggregate> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -92,22 +187,22 @@ <dependency> <groupId>org.jboss.dna</groupId> <artifactId>dna-common</artifactId> - <version>0.1-SNAPSHOT</version> + <version>${dna-version}</version> </dependency> <dependency> <groupId>org.jboss.dna</groupId> <artifactId>dna-maven-classloader</artifactId> - <version>0.1-SNAPSHOT</version> + <version>${dna-version}</version> </dependency> <dependency> <groupId>org.jboss.dna</groupId> <artifactId>dna-spi</artifactId> - <version>0.1-SNAPSHOT</version> + <version>${dna-version}</version> </dependency> <dependency> <groupId>org.jboss.dna</groupId> <artifactId>dna-repository</artifactId> - <version>0.1-SNAPSHOT</version> + <version>${dna-version}</version> </dependency> <!-- Rules @@ -243,6 +338,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> </plugin> - </plugins> + </plugins> </reporting> </project>