Author: wkeil Date: Sat Dec 27 18:29:53 2014 New Revision: 1648085 URL: http://svn.apache.org/r1648085 Log: DMAP-111: Improve Web Examples
Task-Url: https://issues.apache.org/jira/browse/DMAP-111 Modified: devicemap/trunk/examples/ddr-filter/pom.xml devicemap/trunk/examples/ddr-service/pom.xml devicemap/trunk/examples/pom.xml devicemap/trunk/examples/src/devicemap examples clean install.launch Modified: devicemap/trunk/examples/ddr-filter/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-filter/pom.xml?rev=1648085&r1=1648084&r2=1648085&view=diff ============================================================================== --- devicemap/trunk/examples/ddr-filter/pom.xml (original) +++ devicemap/trunk/examples/ddr-filter/pom.xml Sat Dec 27 18:29:53 2014 @@ -15,7 +15,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> <scope>provided</scope> </dependency> <dependency> @@ -35,7 +34,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> </dependencies> Modified: devicemap/trunk/examples/ddr-service/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-service/pom.xml?rev=1648085&r1=1648084&r2=1648085&view=diff ============================================================================== --- devicemap/trunk/examples/ddr-service/pom.xml (original) +++ devicemap/trunk/examples/ddr-service/pom.xml Sat Dec 27 18:29:53 2014 @@ -18,7 +18,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> <scope>provided</scope> </dependency> <dependency> @@ -34,7 +33,6 @@ <dependency> <groupId>jstl</groupId> <artifactId>jstl</artifactId> - <version>1.2</version> </dependency> <dependency> <groupId>log4j</groupId> @@ -44,12 +42,10 @@ <dependency> <groupId>org.apache.devicemap</groupId> <artifactId>devicemap-simpleddr</artifactId> - <version>${devicemap.ddr.version}</version> </dependency> <dependency> <groupId>org.apache.devicemap</groupId> <artifactId>devicemap-data</artifactId> - <version>${devicemap.data.version}</version> </dependency> <!-- TODO use Maven plugin like in DDR lib <dependency> <groupId>org.w3c</groupId> <artifactId>ddr-simple</artifactId> <version>${w3cddr.version}</version> @@ -68,31 +64,35 @@ </resource> </resources> <plugins> - <!-- + <!-- <plugin> <groupId>com.googlecode.addjars-maven-plugin</groupId> <artifactId>addjars-maven-plugin</artifactId> + <version>1.0.5</version> <executions> <execution> <goals> <goal>add-jars</goal> + </goals> <configuration> <resources> <resource> <directory>${basedir}/src/main/webapp/WEB-INF/lib</directory> + </resource> </resources> </configuration> </execution> </executions> </plugin> --> <plugin> - <groupId>com.googlecode.addjars-maven-plugin</groupId> - <artifactId>addjars-maven-plugin</artifactId> - <version>1.0.5</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <goals> - <goal>add-jars</goal> + <id>src-dependencies</id> + <phase>package</phase> + <goals> <!-- use copy-dependencies instead if you don't want to explode the sources --> + <goal>unpack-dependencies</goal> </goals> <configuration> - <resources> - <resource> - <directory>${basedir}/src/main/webapp/WEB-INF/lib</directory> - </resource> - </resources> + <classifier>sources</classifier> + <includes>**/*.xml</includes> + <excludes>**/*.properties</excludes> + <excludes>**/*.class</excludes> + <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact> + <outputDirectory>/temp/devicemap-data</outputDirectory> </configuration> </execution> </executions> </plugin> - --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.3</version> + <version>2.5</version> <configuration> <webResources> <resource> Modified: devicemap/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/pom.xml?rev=1648085&r1=1648084&r2=1648085&view=diff ============================================================================== --- devicemap/trunk/examples/pom.xml (original) +++ devicemap/trunk/examples/pom.xml Sat Dec 27 18:29:53 2014 @@ -15,7 +15,7 @@ <artifactId>examples-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache DeviceMap Examples</name> + <name>Apache DeviceMap Examples (Java)</name> <inceptionYear>2014</inceptionYear> <modules> <module>console</module> @@ -58,10 +58,32 @@ <version>${devicemap.data.version}</version> </dependency> <dependency> + <groupId>org.apache.devicemap</groupId> + <artifactId>devicemap-simpleddr</artifactId> + <version>${devicemap.ddr.version}</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl</artifactId> <version>2.1.1</version> </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> Modified: devicemap/trunk/examples/src/devicemap examples clean install.launch URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/src/devicemap%20examples%20clean%20install.launch?rev=1648085&r1=1648084&r2=1648085&view=diff ============================================================================== --- devicemap/trunk/examples/src/devicemap examples clean install.launch (original) +++ devicemap/trunk/examples/src/devicemap examples clean install.launch Sat Dec 27 18:29:53 2014 @@ -12,6 +12,9 @@ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/examples-parent}"/> </launchConfiguration>
