Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

package refactoring

Browse Source
This commit is contained in:
Athou
2013-03-23 16:17:19 +01:00
parent 7067646b2d
commit 4df1e7f722
36 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/commafeed/frontend/CommaFeedApplication.java
View File

@@ -26,9 +26,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.frontend.components.auth.LoginPage;
import com.commafeed.frontend.components.auth.LogoutPage;
import com.commafeed.frontend.pages.home.HomePage;
import com.commafeed.frontend.pages.HomePage;
import com.commafeed.frontend.pages.LoginPage;
import com.commafeed.frontend.pages.LogoutPage;
import com.commafeed.frontend.utils.exception.DisplayExceptionPage;
public class CommaFeedApplication extends AuthenticatedWebApplication {

4
src/main/java/com/commafeed/frontend/CommaFeedSession.java
View File

@@ -8,8 +8,8 @@ import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
import com.commafeed.backend.dao.UserService;
import com.commafeed.frontend.components.auth.Role;
import com.commafeed.model.User;
import com.commafeed.backend.model.User;
import com.commafeed.frontend.pages.auth.Role;
@SuppressWarnings("serial")
public class CommaFeedSession extends AuthenticatedWebSession {

2
src/main/java/com/commafeed/frontend/rest/model/Category.java → src/main/java/com/commafeed/frontend/model/Category.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest.model;
package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.List;

2
src/main/java/com/commafeed/frontend/rest/model/Entries.java → src/main/java/com/commafeed/frontend/model/Entries.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest.model;
package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.List;

2
src/main/java/com/commafeed/frontend/rest/model/Entry.java → src/main/java/com/commafeed/frontend/model/Entry.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest.model;
package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Date;

2
src/main/java/com/commafeed/frontend/rest/model/Subscription.java → src/main/java/com/commafeed/frontend/model/Subscription.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest.model;
package com.commafeed.frontend.model;
import java.io.Serializable;

0
src/main/java/com/commafeed/frontend/pages/home/HomePage.html → src/main/java/com/commafeed/frontend/pages/HomePage.html
View File

4
src/main/java/com/commafeed/frontend/pages/home/HomePage.java → src/main/java/com/commafeed/frontend/pages/HomePage.java
View File

@@ -1,9 +1,9 @@
package com.commafeed.frontend.pages.home;
package com.commafeed.frontend.pages;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.markup.html.WebPage;
import com.commafeed.frontend.components.auth.Role;
import com.commafeed.frontend.pages.auth.Role;
@SuppressWarnings("serial")
@AuthorizeInstantiation(Role.USER)

0
src/main/java/com/commafeed/frontend/components/auth/LoginPage.html → src/main/java/com/commafeed/frontend/pages/LoginPage.html
View File

4
src/main/java/com/commafeed/frontend/components/auth/LoginPage.java → src/main/java/com/commafeed/frontend/pages/LoginPage.java
View File

@@ -1,7 +1,9 @@
package com.commafeed.frontend.components.auth;
package com.commafeed.frontend.pages;
import org.apache.wicket.markup.html.WebPage;
import com.commafeed.frontend.pages.auth.LoginPanel;
@SuppressWarnings("serial")
public class LoginPage extends WebPage {

2
src/main/java/com/commafeed/frontend/components/auth/LogoutPage.java → src/main/java/com/commafeed/frontend/pages/LogoutPage.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.components.auth;
package com.commafeed.frontend.pages;
import org.apache.wicket.markup.html.WebPage;

0
src/main/java/com/commafeed/frontend/components/auth/LoginPanel.html → src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.html
View File

2
src/main/java/com/commafeed/frontend/components/auth/LoginPanel.java → src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.components.auth;
package com.commafeed.frontend.pages.auth;
import org.apache.wicket.authroles.authentication.panel.SignInPanel;

2
src/main/java/com/commafeed/frontend/components/auth/Role.java → src/main/java/com/commafeed/frontend/pages/auth/Role.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.components.auth;
package com.commafeed.frontend.pages.auth;
public class Role {
public static final String USER = "user";

2
src/main/java/com/commafeed/frontend/rest/RESTApplication.java
View File

@@ -5,6 +5,8 @@ import java.util.Set;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import com.commafeed.frontend.rest.resources.EntriesREST;
import com.commafeed.frontend.rest.resources.SubscriptionsREST;
import com.google.common.collect.Sets;
@ApplicationPath("/rest")

4
src/main/java/com/commafeed/frontend/rest/AbstractREST.java → src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest;
package com.commafeed.frontend.rest.resources;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -18,8 +18,8 @@ import com.commafeed.backend.dao.FeedCategoryService;
import com.commafeed.backend.dao.FeedEntryService;
import com.commafeed.backend.dao.FeedEntryStatusService;
import com.commafeed.backend.dao.FeedSubscriptionService;
import com.commafeed.backend.model.User;
import com.commafeed.frontend.CommaFeedSession;
import com.commafeed.model.User;
@Produces(MediaType.APPLICATION_JSON)
public abstract class AbstractREST {

14
src/main/java/com/commafeed/frontend/rest/EntriesREST.java → src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest;
package com.commafeed.frontend.rest.resources;
import java.util.Collection;
import java.util.Collections;
@@ -11,13 +11,13 @@ import javax.ws.rs.PathParam;
import org.apache.commons.lang.ObjectUtils;
import com.commafeed.frontend.rest.model.Entries;
import com.commafeed.frontend.rest.model.Entry;
import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedEntryStatus;
import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.frontend.model.Entries;
import com.commafeed.frontend.model.Entry;
import com.commafeed.frontend.utils.ModelFactory.MF;
import com.commafeed.model.FeedCategory;
import com.commafeed.model.FeedEntry;
import com.commafeed.model.FeedEntryStatus;
import com.commafeed.model.FeedSubscription;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;

10
src/main/java/com/commafeed/frontend/rest/SubscriptionsREST.java → src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
View File

@@ -1,4 +1,4 @@
package com.commafeed.frontend.rest;
package com.commafeed.frontend.rest.resources;
import java.util.List;
@@ -7,10 +7,10 @@ import javax.ws.rs.Path;
import org.apache.commons.lang.ObjectUtils;
import com.commafeed.frontend.rest.model.Category;
import com.commafeed.frontend.rest.model.Subscription;
import com.commafeed.model.FeedCategory;
import com.commafeed.model.FeedSubscription;
import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.frontend.model.Category;
import com.commafeed.frontend.model.Subscription;
@Path("subscriptions")
public class SubscriptionsREST extends AbstractREST {