You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by wk...@apache.org on 2014/06/09 03:27:35 UTC
svn commit: r1601296 - in /incubator/devicemap/trunk/contrib/web:
devicemapweb/pom.xml pom.xml webfilter/pom.xml
webfilter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
webservice-java/pom.xml
Author: wkeil
Date: Mon Jun 9 01:27:34 2014
New Revision: 1601296
URL: http://svn.apache.org/r1601296
Log:
Updated Web projects
Modified:
incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml
incubator/devicemap/trunk/contrib/web/pom.xml
incubator/devicemap/trunk/contrib/web/webfilter/pom.xml
incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml
Modified: incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml?rev=1601296&r1=1601295&r2=1601296&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml Mon Jun 9 01:27:34 2014
@@ -5,7 +5,6 @@
<artifactId>devicemapweb</artifactId>
<name>Apache DeviceMap Web Site</name>
- <version>1.2-SNAPSHOT</version>
<packaging>war</packaging>
<parent>
<groupId>org.apache.devicemap.web</groupId>
Modified: incubator/devicemap/trunk/contrib/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/pom.xml?rev=1601296&r1=1601295&r2=1601296&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/pom.xml Mon Jun 9 01:27:34 2014
@@ -15,7 +15,8 @@
<properties>
<java.version>1.6</java.version>
- <devicemap.version>0.9.9-SNAPSHOT</devicemap.version>
+ <devicemap.version>0.2-SNAPSHOT</devicemap.version>
+ <devicemap.data.version>0.9.9-SNAPSHOT</devicemap.data.version>
<w3cddr.version>2008-04-04</w3cddr.version>
<build.date>${maven.build.timestamp}</build.date>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: incubator/devicemap/trunk/contrib/web/webfilter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webfilter/pom.xml?rev=1601296&r1=1601295&r2=1601296&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/webfilter/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/webfilter/pom.xml Mon Jun 9 01:27:34 2014
@@ -20,11 +20,6 @@
</dependency>
<dependency>
<groupId>org.apache.devicemap</groupId>
- <artifactId>org.apache.devicemap.classifier</artifactId>
- <version>${devicemap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.devicemap</groupId>
<artifactId>org.apache.devicemap.simpleddr</artifactId>
<version>${devicemap.version}</version>
</dependency>
@@ -38,13 +33,13 @@
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>org.apache.devicemap.devicedata</artifactId>
- <version>${devicemap.version}</version>
+ <version>${devicemap.data.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>org.apache.devicemap.testdata</artifactId>
- <version>${devicemap.version}</version>
+ <version>${devicemap.data.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java?rev=1601296&r1=1601295&r2=1601296&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java (original)
+++ incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java Mon Jun 9 01:27:34 2014
@@ -19,7 +19,7 @@ import org.w3c.ddr.simple.PropertyValues
import org.w3c.ddr.simple.Service;
import org.w3c.ddr.simple.ServiceFactory;
import org.w3c.ddr.simple.exception.NameException;
-import org.apache.devicemap.client.DeviceMapClient;
+//import org.apache.devicemap.client.DeviceMapClient;
import org.apache.devicemap.simpleddr.ODDRService;
/**
@@ -27,7 +27,7 @@ import org.apache.devicemap.simpleddr.OD
*/
public class IdentificationFilter implements Filter {
private Service identificationService = null;
- private DeviceMapClient client = null;
+// private DeviceMapClient client = null;
/**
* Default constructor.
@@ -46,7 +46,7 @@ public class IdentificationFilter implem
try {
initializationProperties.load(context.getResourceAsStream("/WEB-INF/oddr.properties"));
identificationService = ServiceFactory.newService("org.apache.devicemap.simpleddr.ODDRService", initializationProperties.getProperty(ODDRService.ODDR_VOCABULARY_IRI), initializationProperties);
- client = new DeviceMapClient();
+// client = new DeviceMapClient();
} catch (Exception ex) {
throw new RuntimeException(ex);
Modified: incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml?rev=1601296&r1=1601295&r2=1601296&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml Mon Jun 9 01:27:34 2014
@@ -5,7 +5,6 @@
<artifactId>devicemapjavaservice</artifactId>
<name>Apache DeviceMap Java Web Service</name>
- <version>1.2-SNAPSHOT</version>
<packaging>war</packaging>
<parent>
@@ -49,7 +48,7 @@
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>org.apache.devicemap.devicedata</artifactId>
- <version>${devicemap.version}</version>
+ <version>${devicemap.data.version}</version>
</dependency>
<dependency>
<groupId>org.w3c.ddr.simple</groupId>