devicemap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wk...@apache.org
Subject svn commit: r1648076 - in /devicemap/trunk/examples/ddr-filter: pom.xml src/main/webapp/WEB-INF/oddr.properties
Date Sat, 27 Dec 2014 17:57:42 GMT
Author: wkeil
Date: Sat Dec 27 17:57:42 2014
New Revision: 1648076

URL: http://svn.apache.org/r1648076
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-filter/src/main/webapp/WEB-INF/oddr.properties

Modified: devicemap/trunk/examples/ddr-filter/pom.xml
URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-filter/pom.xml?rev=1648076&r1=1648075&r2=1648076&view=diff
==============================================================================
--- devicemap/trunk/examples/ddr-filter/pom.xml (original)
+++ devicemap/trunk/examples/ddr-filter/pom.xml Sat Dec 27 17:57:42 2014
@@ -23,22 +23,15 @@
 			<artifactId>devicemap-simpleddr</artifactId>
 			<version>${devicemap.ddr.version}</version>
 		</dependency>
-		<!--  <dependency>
-			<groupId>org.w3c</groupId>
-			<artifactId>ddr-simple</artifactId>
-			<version>${w3cddr.version}</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.w3c</groupId> <artifactId>ddr-simple</artifactId>

+			<version>${w3cddr.version}</version> </dependency> -->
 		<dependency>
 			<groupId>org.apache.devicemap</groupId>
 			<artifactId>devicemap-data</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.devicemap</groupId>
-			<artifactId>devicemap-test-data</artifactId>
-			<version>${devicemap.testdata.version}</version>
-			<scope>test</scope>
-		</dependency>
+		<!-- dependency> <groupId>org.apache.devicemap</groupId> <artifactId>devicemap-test-data</artifactId>

+			<version>${devicemap.testdata.version}</version> <scope>test</scope>
</dependency -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -51,6 +44,27 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<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>
+							<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-compiler-plugin</artifactId>
 				<configuration>
 					<source>${java.version}</source>
@@ -58,6 +72,23 @@
 					<debug>true</debug>
 				</configuration>
 			</plugin>
+<!-- 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<webResources>
+						<resource>
+							<!- this is relative to the pom.xml directory ->
+							<directory>../../data/device-data/src/main/resources</directory>
+							<!- override the destination directory for this resource ->
+							<targetPath>WEB-INF/classes</targetPath>
+						</resource>
+					</webResources>
+				</configuration>
+			</plugin>
+ -->
 		</plugins>
 	</build>
 </project>

Modified: devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties
URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties?rev=1648076&r1=1648075&r2=1648076&view=diff
==============================================================================
--- devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties (original)
+++ devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties Sat Dec 27
17:57:42 2014
@@ -1,11 +1,11 @@
-oddr.ua.device.builder.path=${workspace_loc}/device-data/src/main/resources/devicedata/BuilderDataSource.xml
-oddr.ua.device.datasource.path=${workspace_loc}/device-data/src/main/resources/devicedata/DeviceDataSource.xml
-oddr.ua.device.builder.patch.paths=${workspace_loc}/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml
-oddr.ua.device.datasource.patch.paths=${workspace_loc}/device-data/src/main/resources/devicedata/DeviceDataSourcePatch.xml
-oddr.ua.browser.datasource.path=${workspace_loc}/device-data/src/main/resources/devicedata/BrowserDataSource.xml
-oddr.ua.operatingSystem.datasource.path=${workspace_loc}/device-data/src/main/resources/devicedata/OperatingSystemDataSource.xml
-ddr.vocabulary.core.path=${workspace_loc}/device-data/src/main/resources/devicedata/coreVocabulary.xml
-oddr.vocabulary.path=${workspace_loc}/device-data/src/main/resources/devicedata/oddrVocabulary.xml
-oddr.limited.vocabulary.path=${workspace_loc}/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml
+oddr.ua.device.builder.path=/temp/devicemap-data/devicedata/BuilderDataSource.xml
+oddr.ua.device.datasource.path=/temp/devicemap-data/devicedata/devicedataSource.xml
+oddr.ua.device.builder.patch.paths=/temp/devicemap-data/devicedata/BuilderDataSourcePatch.xml
+oddr.ua.device.datasource.patch.paths=/temp/devicemap-data/devicedata/devicedataSourcePatch.xml
+oddr.ua.browser.datasource.path=/temp/devicemap-data/devicedata/BrowserDataSource.xml
+oddr.ua.operatingSystem.datasource.path=/temp/devicemap-data/devicedata/OperatingSystemDataSource.xml
+ddr.vocabulary.core.path=/temp/devicemap-data/devicedata/coreVocabulary.xml
+oddr.vocabulary.path=/temp/devicemap-data/devicedata/oddrVocabulary.xml
+oddr.limited.vocabulary.path=/temp/devicemap-data/devicedata/oddrLimitedVocabulary.xml
 oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary
 oddr.threshold=70



Mime
View raw message