Author: retog

pom.xml

@@ -8,7 +8,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.wymiwyg</groupId>
 	<artifactId>wrhapi</artifactId>
-	<version>0.7</version>
+	<version>0.8-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WRHAPI</name>
 	<build>
@@ -58,10 +58,10 @@
 	</build>
 	<description>Web Request Handler API</description>
 	<dependencies>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wymiwyg-commons-core</artifactId>
-		</dependency>	
+		</dependency>	-->
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi_R4_core</artifactId>

src/main/java/org/wymiwyg/wrhapi/activator/Activator.java

@@ -56,7 +56,7 @@
  *				  cardinality="0..n"
  * @scr.property name="port" value="8282"
  * @scr.property name="mappings"
- *               values.name=""
+ *               values.name="[placeholder]"
  * 
  */
 public class Activator {
@@ -180,6 +180,9 @@ private Map<String, ParameterizedPath> getMappings(String[] mappings) throws IOE
 		Set<String> knownServiceNames = new HashSet<String>(nameServiceMap.
 				keySet());
 		for (String mapping : mappings) {
+			if ("[placeholder]".equals(mapping)) {
+				continue;
+			}
 			int firstEqualsPos = mapping.indexOf('=');
 			if (firstEqualsPos == -1) {
 				log.warn("invalid mapping " + mapping);

src/main/java/org/wymiwyg/wrhapi/util/AcceptHeaderIterator.java

@@ -63,19 +63,14 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * @author reto
  */
 public class AcceptHeaderIterator implements Iterator<AcceptHeaderEntry> {
 
-	Log log = LogFactory.getLog(AcceptHeaderIterator.class);
 	private Iterator<AcceptHeaderEntry> iterator;
 
-	
-	
 	/**
 	 * 
 	 */
@@ -87,7 +82,7 @@ public class AcceptHeaderIterator implements Iterator<AcceptHeaderEntry> {
 				AcceptHeaderEntry currentHeader = new AcceptHeaderEntry(currentstring);
 				acceptHeaderSet.add(currentHeader);
 			} catch (InvalidPatternException e) {
-				log.error(e.toString());
+				throw new RuntimeException(e);
 			}
 		}
 		iterator = acceptHeaderSet.iterator();

src/main/java/org/wymiwyg/wrhapi/util/AcceptLanguagesIterator.java

@@ -16,8 +16,7 @@
  */
 package org.wymiwyg.wrhapi.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
 
 import java.util.Iterator;
 import java.util.SortedSet;
@@ -28,7 +27,7 @@
  * @author reto
  */
 public class AcceptLanguagesIterator implements Iterator<AcceptLanguageHeaderEntry> {
-    Log log = LogFactory.getLog(AcceptLanguagesIterator.class);
+
     private Iterator<AcceptLanguageHeaderEntry> iterator;
 
     /**

src/main/java/org/wymiwyg/wrhapi/util/EnhancedRequest.java

@@ -23,8 +23,7 @@
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
 import org.wymiwyg.wrhapi.HandlerException;
 import org.wymiwyg.wrhapi.HeaderName;
 import org.wymiwyg.wrhapi.Request;
@@ -38,7 +37,6 @@
  * @author reto
  */
 public class EnhancedRequest extends RequestWrapper {
-	private static final Log log = LogFactory.getLog(EnhancedRequest.class);
 
 	private String host;
 
@@ -180,7 +178,7 @@ public Cookie[] getCookies() throws HandlerException {
 				try {
 					resultCollection.add(new Cookie(tokens.nextToken()));
 				} catch (InvalidCookieException e) {
-					log.warn("Invalid cookie: " + e.toString());
+					throw new HandlerException(e);
 				}
 			}
 		}

src/main/java/org/wymiwyg/wrhapi/util/MediaRange.java

@@ -60,14 +60,12 @@
 
 import javax.activation.MimeType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * @author reto
  */
 public class MediaRange implements Comparable<MediaRange> {
-	private static Log logger = LogFactory.getLog(MediaRange.class);
+
 	private String type, subtype;
 	// accessed by AccedHeaderEntry
 	Map<String, String> parameters = new HashMap<String, String>();
@@ -145,9 +143,6 @@ && match(subtype, mimeType.getSubType())) {
 	 */
 	private boolean match(String pattern, String string) {
 		boolean result = pattern.equals("*") || pattern.equals(string);
-		if (logger.isDebugEnabled()) {
-			logger.debug(string + " matches " + pattern + "?" + result);
-		}
 		return result;
 	}
 

src/main/java/org/wymiwyg/wrhapi/util/parameterparser/FormFile.java

@@ -10,7 +10,7 @@ public class KeyValuePair<T> {
 	String key;
 	T value;
 
-	KeyValuePair(String key, T value) {
+	public KeyValuePair(String key, T value) {
 		super();
 		this.key = key;
 		this.value = value;