Author: wkeil Date: Sat Dec 27 23:54:25 2014 New Revision: 1648132 URL: http://svn.apache.org/r1648132 Log: DMAP-111: Improve Web Examples
Task-Url: https://issues.apache.org/jira/browse/DMAP-111 Added: devicemap/trunk/examples/distribution/src/main/ devicemap/trunk/examples/distribution/src/main/distribution/ devicemap/trunk/examples/distribution/src/main/distribution/assembly.xml Modified: devicemap/trunk/examples/distribution/pom.xml devicemap/trunk/examples/distribution/src/assembly/bin.xml devicemap/trunk/examples/pom.xml Modified: devicemap/trunk/examples/distribution/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/distribution/pom.xml?rev=1648132&r1=1648131&r2=1648132&view=diff ============================================================================== --- devicemap/trunk/examples/distribution/pom.xml (original) +++ devicemap/trunk/examples/distribution/pom.xml Sat Dec 27 23:54:25 2014 @@ -20,27 +20,45 @@ <artifactId>console-example</artifactId> <version>${devicemap.examples.version}</version> </dependency> + <dependency> + <groupId>org.apache.devicemap.examples</groupId> + <artifactId>ddr-filter</artifactId> + <version>${devicemap.examples.version}</version> + </dependency> + <dependency> + <groupId>org.apache.devicemap.examples</groupId> + <artifactId>dmap-ddr-service</artifactId> + <version>${devicemap.examples.version}</version> + </dependency> </dependencies> + <profiles> + <profile> + <id>assemble</id> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assemble</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/distribution/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>devicemap-examples-${project.version}</finalName> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <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> + </profile> + </profiles> </project> \ No newline at end of file Modified: devicemap/trunk/examples/distribution/src/assembly/bin.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/distribution/src/assembly/bin.xml?rev=1648132&r1=1648131&r2=1648132&view=diff ============================================================================== --- devicemap/trunk/examples/distribution/src/assembly/bin.xml (original) +++ devicemap/trunk/examples/distribution/src/assembly/bin.xml Sat Dec 27 23:54:25 2014 @@ -1,29 +1,25 @@ -<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>java</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 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>java</id> + <formats> + <format>dir</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:*</include> + </includes> + <binaries> + <outputDirectory>modules/${artifactId}</outputDirectory> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> </assembly> \ No newline at end of file Added: devicemap/trunk/examples/distribution/src/main/distribution/assembly.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/distribution/src/main/distribution/assembly.xml?rev=1648132&view=auto ============================================================================== --- devicemap/trunk/examples/distribution/src/main/distribution/assembly.xml (added) +++ devicemap/trunk/examples/distribution/src/main/distribution/assembly.xml Sat Dec 27 23:54:25 2014 @@ -0,0 +1,67 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<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>distribution</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + </formats> + <fileSets> + <fileSet> + <directory>${project.basedir}/../..</directory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> + </includes> + <outputDirectory>.</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <includes> + <include>org.apache.devicemap.examples:*</include> + </includes> + <outputDirectory>examples</outputDirectory> + </dependencySet> + </dependencySets> + <!-- files> + <file> + <source>src/main/distribution/core-module.xml</source> + <outputDirectory>core</outputDirectory> + <destName>module.xml</destName> + <filtered>true</filtered> + </file> + <file> + <source>src/main/distribution/cdictrl-module.xml</source> + <outputDirectory>cdictrl</outputDirectory> + <destName>module.xml</destName> + <filtered>true</filtered> + </file> + <file> + <source>src/main/distribution/modules-module.xml</source> + <outputDirectory>modules</outputDirectory> + <destName>module.xml</destName> + <filtered>true</filtered> + </file> + </files --> +</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=1648132&r1=1648131&r2=1648132&view=diff ============================================================================== --- devicemap/trunk/examples/pom.xml (original) +++ devicemap/trunk/examples/pom.xml Sat Dec 27 23:54:25 2014 @@ -23,7 +23,6 @@ <module>spring</module> <module>ddr-filter</module> <module>ddr-service</module> - <module>distribution</module> </modules> <parent> <groupId>org.apache</groupId> @@ -89,7 +88,7 @@ </dependencyManagement> <build> - <pluginManagement> + <!-- >pluginManagement> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -100,7 +99,7 @@ </configuration> </plugin> </plugins> - </pluginManagement> + </pluginManagement --> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>
