Author: mgrigorov
Date: Mon Jan 24 20:59:06 2011
New Revision: 1062973
URL: http://svn.apache.org/viewvc?rev=1062973&view=rev
Log:
WICKET-3381 Unable to see source of the spring examle
Move all Spring examples in o.a.w.examples package because SourcePage doesn't
allow to see them otherwise.
Added:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
(contents, props changed)
- copied, changed from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.java
Removed:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.java
Modified:
wicket/trunk/wicket-examples/src/main/resources/applicationContext.xml
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.html)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.html&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java
Mon Jan 24 20:59:06 2011
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.annot.web;
+package org.apache.wicket.examples.spring.annot.web;
+import org.apache.wicket.examples.spring.common.ContactDao;
+import org.apache.wicket.examples.spring.common.web.ContactsDisplayPage;
import
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.spring.common.ContactDao;
-import org.apache.wicket.spring.common.web.ContactsDisplayPage;
import org.apache.wicket.spring.injection.annot.SpringBean;
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java
Mon Jan 24 20:59:06 2011
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.annot.web;
+package org.apache.wicket.examples.spring.annot.web;
+import org.apache.wicket.examples.spring.common.Contact;
+import org.apache.wicket.examples.spring.common.ContactDao;
+import org.apache.wicket.examples.spring.common.web.ContactDataProvider;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.spring.common.Contact;
-import org.apache.wicket.spring.common.ContactDao;
-import org.apache.wicket.spring.common.web.ContactDataProvider;
-
public class ProxyDataProvider extends ContactDataProvider
{
private ContactDao dao;
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyDataProvider.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java
Mon Jan 24 20:59:06 2011
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.annot.web;
+package org.apache.wicket.examples.spring.annot.web;
-import org.apache.wicket.spring.common.Contact;
-import org.apache.wicket.spring.common.ContactDao;
-import org.apache.wicket.spring.common.web.ContactDetachableModel;
+import org.apache.wicket.examples.spring.common.Contact;
+import org.apache.wicket.examples.spring.common.ContactDao;
+import org.apache.wicket.examples.spring.common.web.ContactDetachableModel;
public class ProxyModel extends ContactDetachableModel
{
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/ProxyModel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
Mon Jan 24 20:59:06 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common;
+package org.apache.wicket.examples.spring.common;
import org.apache.wicket.IClusterable;
@@ -47,16 +47,18 @@ public class Contact implements ICluster
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "[Contact id=" + id + " firstName=" + firstName + "
lastName=" + lastName +
- " homePhone=" + homePhone + " cellPhone=" +
cellPhone + "]";
+ " homePhone=" + homePhone + " cellPhone=" + cellPhone +
"]";
}
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj == this)
@@ -67,9 +69,9 @@ public class Contact implements ICluster
{
Contact other = (Contact)obj;
return other.getFirstName().equals(getFirstName()) &&
-
other.getLastName().equals(getLastName()) &&
-
other.getHomePhone().equals(getHomePhone()) &&
-
other.getCellPhone().equals(getCellPhone());
+ other.getLastName().equals(getLastName()) &&
+ other.getHomePhone().equals(getHomePhone()) &&
+ other.getCellPhone().equals(getCellPhone());
}
else
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
Mon Jan 24 20:59:06 2011
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common;
+package org.apache.wicket.examples.spring.common;
import java.util.Iterator;
+import org.apache.wicket.examples.spring.common.QueryParam;
+
/**
* interface for retrieving contacts from a database
*
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDao.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java
Mon Jan 24 20:59:06 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common;
+package org.apache.wicket.examples.spring.common;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.wicket.examples.spring.common.QueryParam;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
/**
@@ -109,7 +110,8 @@ public class ContactDaoImpl implements C
{
return sort.isAscending() ? lnameIdx : lnameDescIdx;
}
- throw new RuntimeException("unknown sort option [" + sort + "].
valid fields: [firstName], [lastName]");
+ throw new RuntimeException("unknown sort option [" + sort +
+ "]. valid fields: [firstName], [lastName]");
}
/**
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
Mon Jan 24 20:59:06 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common;
+package org.apache.wicket.examples.spring.common;
import java.util.Collection;
@@ -92,9 +92,15 @@ public class ContactGenerator
private String generatePhoneNumber()
{
- return new StringBuilder().append(rint(2, 9)).append(rint(0,
9)).append(rint(0, 9)).append(
- "-555-").append(rint(1, 9)).append(rint(0,
9)).append(rint(0, 9))
- .append(rint(0, 9)).toString();
+ return new StringBuilder().append(rint(2, 9))
+ .append(rint(0, 9))
+ .append(rint(0, 9))
+ .append("-555-")
+ .append(rint(1, 9))
+ .append(rint(0, 9))
+ .append(rint(0, 9))
+ .append(rint(0, 9))
+ .toString();
}
private int rint(int min, int max)
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java
Mon Jan 24 20:59:06 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common;
+package org.apache.wicket.examples.spring.common;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -50,7 +50,7 @@ public class QueryParam
* @param first
* First element to return.
* @param count
- * Number of elements to return.
+ * Number of elements to return.
* @param sort
*/
public QueryParam(int first, int count, SortParam sort)
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/QueryParam.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.html&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
Mon Jan 24 20:59:06 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common.web;
+package org.apache.wicket.examples.spring.common.web;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java
Mon Jan 24 20:59:06 2011
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common.web;
+package org.apache.wicket.examples.spring.common.web;
import java.util.Iterator;
+import org.apache.wicket.examples.spring.common.ContactDao;
+import org.apache.wicket.examples.spring.common.QueryParam;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.spring.common.ContactDao;
-import org.apache.wicket.spring.common.QueryParam;
/**
* Base class for contact data provider implementations. This class implements
everything except
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDataProvider.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java
Mon Jan 24 20:59:06 2011
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common.web;
+package org.apache.wicket.examples.spring.common.web;
+import org.apache.wicket.examples.spring.common.Contact;
+import org.apache.wicket.examples.spring.common.ContactDao;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.spring.common.Contact;
-import org.apache.wicket.spring.common.ContactDao;
-
/**
* Base class for contact detachable models. This class implements all
necessary logic except
* retrieval of the dao object, this way we can isolate that logic in our
example implementations.
@@ -39,7 +38,7 @@ public abstract class ContactDetachableM
public ContactDetachableModel(Contact contact)
{
super(contact);
- this.id = contact.getId();
+ id = contact.getId();
}
protected abstract ContactDao getContactDao();
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
Mon Jan 24 20:59:06 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common.web;
+package org.apache.wicket.examples.spring.common.web;
import java.util.Arrays;
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
Mon Jan 24 20:59:06 2011
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common.web;
+package org.apache.wicket.examples.spring.common.web;
+import org.apache.wicket.examples.spring.common.ContactDao;
+import org.apache.wicket.examples.spring.common.web.HomePage;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.spring.common.ContactDao;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
/**
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.html)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.html&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
(from r1062968,
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java?p2=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java&p1=wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.java&r1=1062968&r2=1062973&rev=1062973&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/HomePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
Mon Jan 24 20:59:06 2011
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.spring.common.web;
+package org.apache.wicket.examples.spring.common.web;
+import org.apache.wicket.examples.spring.annot.web.AnnotPage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.spring.annot.web.AnnotPage;
/**
* Home Page
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: wicket/trunk/wicket-examples/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/resources/applicationContext.xml?rev=1062973&r1=1062972&r2=1062973&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/resources/applicationContext.xml
(original)
+++ wicket/trunk/wicket-examples/src/main/resources/applicationContext.xml Mon
Jan 24 20:59:06 2011
@@ -21,9 +21,9 @@
<!--
setup contact dao
-->
- <bean id="contactDao"
class="org.apache.wicket.spring.common.ContactDaoImpl"/>
+ <bean id="contactDao"
class="org.apache.wicket.examples.spring.common.ContactDaoImpl"/>
<!-- setup wicket application -->
- <bean id="wicketApplication"
class="org.apache.wicket.spring.common.web.ExampleApplication"/>
+ <bean id="wicketApplication"
class="org.apache.wicket.examples.spring.common.web.ExampleApplication"/>
</beans>
