Changeset 4469

Timestamp:

02/07/14 10:07:04 (10 years ago)

Author:

twagoo

Message:

re-organised package structure for wicket app

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo (added)
• main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/WicketApplication.java) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/components (added)
• main/java/eu/clarin/cmdi/vlo/pages (added)
• main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.html (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/FacetedSearchPage.html)
• main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/FacetedSearchPage.java) (1 diff)
• main/java/eu/clarin/cmdi/vlo/pojo (added)
• main/webapp/WEB-INF/web.xml (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo (added)
• test/java/eu/clarin/cmdi/vlo/Start.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/Start.java) (1 diff)
• test/java/eu/clarin/cmdi/vlo/pages (added)
• test/java/eu/clarin/cmdi/vlo/pages/TestFacetedSearchPage.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/TestHomePage.java) (3 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -1 @@
-package eu.clarin.cmdi;
+package eu.clarin.cmdi.vlo;
 
+import eu.clarin.cmdi.vlo.pages.FacetedSearchPage;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.protocol.http.WebApplication;
@@ -10 +11 @@
  * @see eu.clarin.cmdi.Start#main(String[])
  */
-public class WicketApplication extends WebApplication
+public class VloWicketApplication extends WebApplication
 {
         /**

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -1 @@
-package eu.clarin.cmdi;
+package eu.clarin.cmdi.vlo.pages;
 
 import org.apache.wicket.request.mapper.parameter.PageParameters;

vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/WEB-INF/web.xml

@@ -22 +22 @@
                 <init-param>
                         <param-name>applicationClassName</param-name>
-                        <param-value>eu.clarin.cmdi.WicketApplication</param-value>
+                        <param-value>eu.clarin.cmdi.vlo.VloWicketApplication</param-value>
                 </init-param>
         </filter>

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/Start.java

@@ -1 @@
-package eu.clarin.cmdi;
+package eu.clarin.cmdi.vlo;
 
 import org.apache.wicket.util.time.Duration;

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/pages/TestFacetedSearchPage.java

@@ -1 @@
-package eu.clarin.cmdi;
+package eu.clarin.cmdi.vlo.pages;
 
+import eu.clarin.cmdi.vlo.VloWicketApplication;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.Before;
@@ -8 +9 @@
  * Simple test using the WicketTester
  */
-public class TestHomePage
+public class TestFacetedSearchPage
 {
         private WicketTester tester;
@@ -15 +16 @@
         public void setUp()
         {
-                tester = new WicketTester(new WicketApplication());
+                tester = new WicketTester(new VloWicketApplication());
         }