Author: wkeil Date: Sat Dec 27 19:08:54 2014 New Revision: 1648091 URL: http://svn.apache.org/r1648091 Log: DMAP-111: Improve Web Examples
Task-Url: https://issues.apache.org/jira/browse/DMAP-111 Added: devicemap/trunk/examples/distribution/ (with props) devicemap/trunk/examples/distribution/pom.xml devicemap/trunk/examples/distribution/src/ devicemap/trunk/examples/distribution/src/assembly/ devicemap/trunk/examples/distribution/src/assembly/bin.xml Modified: devicemap/trunk/examples/pom.xml Propchange: devicemap/trunk/examples/distribution/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Dec 27 19:08:54 2014 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Added: devicemap/trunk/examples/distribution/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/distribution/pom.xml?rev=1648091&view=auto ============================================================================== --- devicemap/trunk/examples/distribution/pom.xml (added) +++ devicemap/trunk/examples/distribution/pom.xml Sat Dec 27 19:08:54 2014 @@ -0,0 +1,48 @@ +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.devicemap.examples</groupId> + <artifactId>examples-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <artifactId>distribution</artifactId> + <packaging>pom</packaging> + + <name>Distribution</name> + + <!-- NOTE: These dependency declarations are only required to sort this project to the + end of the line in the multimodule build. + + Since we only include the child1 module in our assembly, we only need to ensure this + distribution project builds AFTER that one... + --> + <dependencies> + <dependency> + <groupId>org.apache.devicemap.examples</groupId> + <artifactId>console-example</artifactId> + <version>${devicemap.examples.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: devicemap/trunk/examples/distribution/src/assembly/bin.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/distribution/src/assembly/bin.xml?rev=1648091&view=auto ============================================================================== --- devicemap/trunk/examples/distribution/src/assembly/bin.xml (added) +++ devicemap/trunk/examples/distribution/src/assembly/bin.xml Sat Dec 27 19:08:54 2014 @@ -0,0 +1,29 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>bin</id> + <formats> + <format>dir</format> + <format>tar.gz</format> + <!-- format>tar.bz2</format --> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <moduleSets> + <moduleSet> + + <!-- Enable access to all projects in the current multimodule build! --> + <useAllReactorProjects>true</useAllReactorProjects> + + <!-- Now, select which projects to include in this module-set. --> + <includes> + <include>org.apache.devicemap.examples:console-example</include> + </includes> + <binaries> + <outputDirectory>/examples</outputDirectory> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Modified: devicemap/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/pom.xml?rev=1648091&r1=1648090&r2=1648091&view=diff ============================================================================== --- devicemap/trunk/examples/pom.xml (original) +++ devicemap/trunk/examples/pom.xml Sat Dec 27 19:08:54 2014 @@ -23,6 +23,7 @@ <module>spring</module> <module>ddr-filter</module> <module>ddr-service</module> + <module>distribution</module> </modules> <parent> <groupId>org.apache</groupId> @@ -40,7 +41,7 @@ <devicemap.version>1.1.0</devicemap.version> <devicemap.ddr.version>1.0.0-SNAPSHOT</devicemap.ddr.version> <devicemap.data.version>1.0.1</devicemap.data.version> - <devicemap.testdata.version>1.0.1-SNAPSHOT</devicemap.testdata.version> + <devicemap.examples.version>1.0.0-SNAPSHOT</devicemap.examples.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> @@ -88,6 +89,19 @@ </dependencyManagement> <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.3</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>
