Author: wkeil Date: Wed Aug 5 22:17:19 2015 New Revision: 1694338 URL: http://svn.apache.org/r1694338 Log: DMAP-111: Improve Web Examples
Task-Url: https://issues.apache.org/jira/browse/DMAP-111 Added: devicemap/trunk/examples/w3c-ddr/pom.xml Modified: devicemap/trunk/examples/w3c-ddr/ (props changed) devicemap/trunk/examples/w3c-ddr/ddr-filter/pom.xml devicemap/trunk/examples/w3c-ddr/ddr-service/pom.xml Propchange: devicemap/trunk/examples/w3c-ddr/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Aug 5 22:17:19 2015 @@ -0,0 +1,3 @@ +target +.settings +.project Modified: devicemap/trunk/examples/w3c-ddr/ddr-filter/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/w3c-ddr/ddr-filter/pom.xml?rev=1694338&r1=1694337&r2=1694338&view=diff ============================================================================== --- devicemap/trunk/examples/w3c-ddr/ddr-filter/pom.xml (original) +++ devicemap/trunk/examples/w3c-ddr/ddr-filter/pom.xml Wed Aug 5 22:17:19 2015 @@ -8,7 +8,7 @@ </properties> <parent> <groupId>org.apache.devicemap.examples</groupId> - <artifactId>examples-parent</artifactId> + <artifactId>dmap-ddr-examples</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>dmap-ddr-filter</artifactId> @@ -17,7 +17,7 @@ <dependencies> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: devicemap/trunk/examples/w3c-ddr/ddr-service/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/w3c-ddr/ddr-service/pom.xml?rev=1694338&r1=1694337&r2=1694338&view=diff ============================================================================== --- devicemap/trunk/examples/w3c-ddr/ddr-service/pom.xml (original) +++ devicemap/trunk/examples/w3c-ddr/ddr-service/pom.xml Wed Aug 5 22:17:19 2015 @@ -10,7 +10,7 @@ <parent> <groupId>org.apache.devicemap.examples</groupId> - <artifactId>examples-parent</artifactId> + <artifactId>dmap-ddr-examples</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <properties> @@ -20,7 +20,7 @@ <dependencies> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -34,8 +34,8 @@ <version>3.2.2.RELEASE</version> </dependency> <dependency> - <groupId>jstl</groupId> - <artifactId>jstl</artifactId> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>javax.servlet.jsp.jstl-api</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> Added: devicemap/trunk/examples/w3c-ddr/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/w3c-ddr/pom.xml?rev=1694338&view=auto ============================================================================== --- devicemap/trunk/examples/w3c-ddr/pom.xml (added) +++ devicemap/trunk/examples/w3c-ddr/pom.xml Wed Aug 5 22:17:19 2015 @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. --> +<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";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>16</version> + </parent> + + <groupId>org.apache.devicemap.examples</groupId> + <artifactId>dmap-ddr-examples</artifactId> + <packaging>pom</packaging> + <name>Apache DeviceMap W3C DDR Examples</name> + <description>Apache DeviceMap W3C DDR Example Parent</description> + <url>http://devicemap.apache.org</url> + <version>1.0.0-SNAPSHOT</version> + <modules> + <module>ddr-filter</module> + <module>ddr-service</module> + </modules> + + <!-- Test settings that can be overridden from the Maven command line --> + <properties> + <java.version>1.6</java.version> + <jdkVersion>${java.version}</jdkVersion> + <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel> + <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel> + <devicemap.data.version>1.0.3</devicemap.data.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <!-- The test data file maps User-Agent values to expected device properties --> + <!-- TODO this folder/module should be deprecated, check if still used + and consider local solution in downstream project --> + <devicemap.test.data.file>${project.build.directory}/devicemap/test-data/dmap_20130522.txt</devicemap.test.data.file> + </properties> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/devicemap/trunk/clients/w3c-ddr</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/devicemap/trunk/clients/w3c-ddr</developerConnection> + <url>http://svn.apache.org/viewvc/devicemap/trunk/clients/w3c-ddr</url> + </scm> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>javax.servlet.jsp.jstl-api</artifactId> + <version>1.2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-jexl</artifactId> + <version>2.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.apache.devicemap</groupId> + <artifactId>devicemap-simpleddr</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.devicemap</groupId> + <artifactId>devicemap-data</artifactId> + <version>${devicemap.data.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> +</project>
