propagate from branch 'i2p.i2p' (head 98f389d40c983a02e3b0803401896e2b1104b44d)

            to branch 'i2p.i2p.str4d.i2ptunnel' (head 9f44bb9e4efa0f9ed76f4988bdd3ebef7ac6b3a7)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/WizardBean.java

+package net.i2p.i2ptunnel.web;
+
+/**
+ * A temporary data holder for the wizard pages
+ *
+ * Warning - This class is not part of the i2ptunnel API, and at some point
+ * it will be moved from the jar to the war.
+ * Usage by classes outside of i2ptunnel.war is deprecated.
+ */
+public class WizardBean extends EditBean {
+    private boolean _isClient;
+    public WizardBean() { super(); }
+
+    /**
+     * Whether the tunnel being set up is a client tunnel or not.
+     * @since 0.8.13
+     */
+    public void setIsClient(String isClient) { 
+        _isClient = Boolean.valueOf(isClient);   
+    }
+    /** @since 0.8.13 */
+    public boolean getIsClient() {
+        return _isClient;
+    }
+}

apps/i2ptunnel/jsp/web.xml

@@ -18,6 +18,11 @@
         <url-pattern>/edit</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>net.i2p.i2ptunnel.jsp.wizard_jsp</servlet-name>
+        <url-pattern>/wizard</url-pattern>
+    </servlet-mapping>
+
     <session-config>
         <session-timeout>
             30