You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2014/07/16 03:31:15 UTC
svn commit: r1610896 - in
/incubator/devicemap/trunk/devicemap/java/classifier: README pom.xml
src/main/java/org/apache/devicemap/Util.java
src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
Author: rezan
Date: Wed Jul 16 01:31:15 2014
New Revision: 1610896
URL: http://svn.apache.org/r1610896
Log:
1.0.0 revert
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/README
incubator/devicemap/trunk/devicemap/java/classifier/pom.xml
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Util.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
Modified: incubator/devicemap/trunk/devicemap/java/classifier/README
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/README?rev=1610896&r1=1610895&r2=1610896&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/README (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/README Wed Jul 16 01:31:15 2014
@@ -29,11 +29,11 @@ The above code has the following devicem
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>devicemap-client</artifactId>
- <version>1.0.0</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>devicemap-data</artifactId>
- <version>1.0.0</version>
+ <version>1.0</version>
</dependency>
Modified: incubator/devicemap/trunk/devicemap/java/classifier/pom.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/pom.xml?rev=1610896&r1=1610895&r2=1610896&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/pom.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/pom.xml Wed Jul 16 01:31:15 2014
@@ -1,68 +1,78 @@
<?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.devicemap</groupId>
- <artifactId>devicemap-java</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>devicemap-client</artifactId>
- <packaging>jar</packaging>
- <name>Apache DeviceMap Client</name>
- <description>Apache DeviceMap Java Client</description>
- <url>http://incubator.apache.org/devicemap</url>
+<!--
+ 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
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ http://www.apache.org/licenses/LICENSE-2.0
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java/classifier</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java/classifier</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier</url>
- </scm>
+ 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>
+
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-client</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0</version>
+ <name>devicemap-client</name>
+ <description>Apache DeviceMap Java API</description>
+ <url>http://incubator.apache.org/devicemap</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.devicemap</groupId>
- <artifactId>devicemap-data</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java/classifier</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java/classifier</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-data</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <debug>true</debug>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Util.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Util.java?rev=1610896&r1=1610895&r2=1610896&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Util.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Util.java Wed Jul 16 01:31:15 2014
@@ -18,9 +18,6 @@
*/
package org.apache.devicemap;
-/**
- * Utility helper class
- */
public class Util {
/*
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java?rev=1610896&r1=1610895&r2=1610896&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java Wed Jul 16 01:31:15 2014
@@ -18,8 +18,6 @@
*/
package org.apache.devicemap.loader.impl;
-import static org.apache.devicemap.Util.normalize;
-
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -195,7 +193,7 @@ public class DDRLoader implements Loader
patterns = new ArrayList<String>();
} else if (tag.equals("<value>")) {
//add the pattern to the device
- String pattern = normalize(parser.getTagValue());
+ String pattern = Util.normalize(parser.getTagValue());
if (pattern.isEmpty()) {
continue;