upgraded to up-to-date jetty and wicket

datacommons · Sep 8, 2014 · 7283191 · 7283191
1 parent cbf1ec7
commit 7283191
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,11 +14,13 @@
     <maven.compile.target>1.7</maven.compile.target>
     <maven.compile.optimize>true</maven.compile.optimize>
     <maven.compile.deprecation>true</maven.compile.deprecation>
-
-    <wicket.version>1.4.21</wicket.version>
-
-    <!-- Lets get more up to date shall we? -->
-    <jetty.version>8.1.2.v20120308</jetty.version>
+
+
+    <wicket.version>6.17.0</wicket.version>
+    <jetty.version>7.6.13.v20130916</jetty.version>
+
+    <!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
+    <wtp.version>none</wtp.version>
 
     <slf4j.version>1.7.7</slf4j.version>
     <lucene.version>4.9.0</lucene.version>

diff --git a/solr-rocks/pom.xml b/solr-rocks/pom.xml
@@ -59,14 +59,8 @@
 
     <dependency>
       <groupId>org.apache.wicket</groupId>
-      <artifactId>wicket</artifactId>
+      <artifactId>wicket-core</artifactId>
       <version>${wicket.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -89,20 +83,14 @@
     </dependency>
 
     <!--  JETTY DEPENDENCIES FOR TESTING  -->
-    <!-- compile scope due to StartDemo.java -->
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all-server</artifactId>
       <version>${jetty.version}</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
+
 
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${jetty.version}</version>
-      <scope>compile</scope>
-    </dependency>
 
   </dependencies>
 
@@ -140,7 +128,7 @@
       <plugin>  
       	<groupId>org.mortbay.jetty</groupId>
   			<artifactId>jetty-maven-plugin</artifactId>
-        <version>8.1.7.v20120910</version>
+        <version>${jetty.version}</version>
         <configuration>
           <scanIntervalSeconds>0</scanIntervalSeconds>
           <webAppConfig>

diff --git a/solr-rocks/src/main/java/ca/markjenkins/geoclusterrocks/SearchPage.java b/solr-rocks/src/main/java/ca/markjenkins/geoclusterrocks/SearchPage.java
@@ -11,7 +11,7 @@
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;

diff --git a/solr-rocks/src/main/java/ca/markjenkins/geoclusterrocks/WicketApplication.java b/solr-rocks/src/main/java/ca/markjenkins/geoclusterrocks/WicketApplication.java
@@ -1,12 +1,6 @@
 package ca.markjenkins.geoclusterrocks;
 
 import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.target.coding.HybridUrlCodingStrategy;
-import org.apache.wicket.util.file.File;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * Application object for your web application. If you want to run this application without deploying, run the Start class.
@@ -32,6 +26,6 @@ public Class<SearchPage> getHomePage()
   protected void init() {
     super.init();
 
-    mount( new HybridUrlCodingStrategy( "search", SearchPage.class ) );
+    mountPage("/geosearch", GeoSearch.class );
   }
 }