Permalink
Browse files

Update to org.rewrite

  • Loading branch information...
1 parent bb0f2eb commit 4d81fc8ea1ad03ad8ac12c9392fa65c770247692 @lincolnthree lincolnthree committed Mar 27, 2012
Showing with 438 additions and 479 deletions.
  1. +13 −6 gwt/pom.xml
  2. +1 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/App.gwt.xml
  3. +1 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/App.java
  4. +1 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/AppPlaceHistoryMapper.java
  5. +1 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/activity/LogoutActivity.java
  6. +2 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/history/HistoryConstants.java
  7. +2 −3 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/history/HistoryServiceState.java
  8. +2 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/view/component/NavLink.java
  9. +3 −2 gwt/src/main/java/com/ocpsoft/socialpm/gwt/client/local/view/component/TopNav.java
  10. +12 −12 gwt/src/main/java/com/ocpsoft/socialpm/gwt/server/history/HistoryRewriteConfiguration.java
  11. +1 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/server/rpc/AuthenticationServiceImpl.java
  12. +1 −1 gwt/src/main/java/com/ocpsoft/socialpm/gwt/server/rpc/ProfileServiceImpl.java
  13. +1 −2 gwt/src/main/java/com/ocpsoft/socialpm/gwt/server/rpc/ProjectServiceImpl.java
  14. +1 −2 ...n/java/com/ocpsoft/socialpm/gwt/server/security/authorization/AuthenticationExceptionHandler.java
  15. +12 −0 model/pom.xml
  16. +291 −276 pom.xml
  17. +2 −0 services/pom.xml
  18. +8 −6 web/pom.xml
  19. +1 −1 web/src/main/java/com/ocpsoft/socialpm/faces/CacheControlPhaseListener.java
  20. +1 −1 web/src/main/java/com/ocpsoft/socialpm/project/Iterations.java
  21. +1 −1 web/src/main/java/com/ocpsoft/socialpm/project/Stories.java
  22. +11 −11 web/src/main/java/com/ocpsoft/socialpm/rewrite/AccessRewriteConfiguration.java
  23. +8 −7 web/src/main/java/com/ocpsoft/socialpm/rewrite/AccountVerificationInterceptor.java
  24. +8 −7 web/src/main/java/com/ocpsoft/socialpm/rewrite/AuthenticationStatusInterceptor.java
  25. +9 −8 web/src/main/java/com/ocpsoft/socialpm/rewrite/CatchallRewriteConfiguration.java
  26. +4 −4 web/src/main/java/com/ocpsoft/socialpm/rewrite/IntegerConstraint.java
  27. +7 −8 web/src/main/java/com/ocpsoft/socialpm/rewrite/MessageInterceptor.java
  28. +15 −14 web/src/main/java/com/ocpsoft/socialpm/rewrite/ProjectRewriteConfiguration.java
  29. +3 −3 web/src/main/java/com/ocpsoft/socialpm/rewrite/RegexConstraint.java
  30. +0 −82 web/src/main/java/com/ocpsoft/socialpm/rewrite/Resource.java
  31. +5 −5 web/src/main/java/com/ocpsoft/socialpm/rewrite/SocialPMResources.java
  32. +3 −3 web/src/main/java/com/ocpsoft/socialpm/rewrite/ToLowerCase.java
  33. +2 −1 web/src/main/java/com/ocpsoft/socialpm/security/Profiles.java
  34. +3 −4 web/src/main/java/com/ocpsoft/socialpm/security/authentication/Authentication.java
  35. +1 −1 web/src/main/java/com/ocpsoft/socialpm/security/authentication/Registration.java
  36. +1 −1 web/src/main/java/com/ocpsoft/socialpm/web/filter/TransactionFilter.java
View
@@ -25,21 +25,20 @@
<slf4j.version>1.5.11</slf4j.version>
<uel.impl.version>2.1.2-b04</uel.impl.version>
<webDescriptor>jetty</webDescriptor>
- <version.rewrite>1.0.0-SNAPSHOT</version.rewrite>
</properties>
<dependencies>
- <dependency>
- <groupId>com.ocpsoft.rewrite</groupId>
+ <dependency>
+ <groupId>org.ocpsoft.rewrite</groupId>
<artifactId>rewrite-impl-servlet</artifactId>
</dependency>
<dependency>
- <groupId>com.ocpsoft.rewrite</groupId>
+ <groupId>org.ocpsoft.rewrite</groupId>
<artifactId>rewrite-integration-gwt</artifactId>
</dependency>
<dependency>
- <groupId>com.ocpsoft.rewrite</groupId>
- <artifactId>rewrite-logging-slf4j</artifactId>
+ <groupId>org.ocpsoft.logging</groupId>
+ <artifactId>logging-adapter-jboss</artifactId>
</dependency>
<dependency>
<groupId>com.ocpsoft.socialpm</groupId>
@@ -69,6 +68,14 @@
<artifactId>solder-impl</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.solder</groupId>
+ <artifactId>solder-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.solder</groupId>
+ <artifactId>solder-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
@@ -3,7 +3,7 @@
"http://google-web-toolkit.googlecode.com/svn/releases/1.6/distro-source/core/src/gwt-module.dtd">
<module rename-to="app">
<inherits name="com.ocpsoft.socialpm.Model" />
- <inherits name="com.ocpsoft.rewrite.gwt.Rewrite" />
+ <inherits name="org.ocpsoft.rewrite.gwt.Rewrite" />
<inherits name="org.jboss.errai.common.ErraiCommon" />
<inherits name="org.jboss.errai.bus.ErraiBus" />
@@ -22,6 +22,7 @@
import org.jboss.errai.bus.client.api.RemoteCallback;
import org.jboss.errai.enterprise.client.cdi.api.CDI;
import org.jboss.errai.ioc.client.api.EntryPoint;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
import com.google.gwt.activity.shared.ActivityManager;
import com.google.gwt.core.client.GWT;
@@ -31,7 +32,6 @@
import com.google.gwt.place.shared.PlaceHistoryHandler;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.SimplePanel;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
import com.ocpsoft.socialpm.gwt.client.local.places.HomePlace;
import com.ocpsoft.socialpm.gwt.client.local.view.events.LoginEvent;
import com.ocpsoft.socialpm.gwt.client.local.view.events.LogoutEvent;
@@ -8,13 +8,13 @@
import javax.inject.Inject;
import org.jboss.errai.ioc.client.container.IOCBeanManager;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.activity.shared.ActivityMapper;
import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceHistoryMapper;
import com.google.gwt.place.shared.PlaceTokenizer;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
import com.ocpsoft.socialpm.gwt.client.local.activity.HomeActivity;
import com.ocpsoft.socialpm.gwt.client.local.activity.LoginActivity;
import com.ocpsoft.socialpm.gwt.client.local.activity.LogoutActivity;
@@ -4,12 +4,12 @@
import javax.inject.Inject;
import org.jboss.errai.bus.client.api.RemoteCallback;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
import com.google.gwt.activity.shared.AbstractActivity;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
import com.ocpsoft.socialpm.gwt.client.local.App;
import com.ocpsoft.socialpm.gwt.client.local.ClientFactory;
import com.ocpsoft.socialpm.gwt.client.local.history.HistoryConstants;
@@ -1,6 +1,7 @@
package com.ocpsoft.socialpm.gwt.client.local.history;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
+
import com.ocpsoft.socialpm.model.user.Profile;
public class HistoryConstants
@@ -5,9 +5,8 @@
import javax.inject.Singleton;
import org.jboss.errai.ioc.client.api.InitBallot;
-
-import com.ocpsoft.rewrite.gwt.client.history.ContextPathListener;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
+import org.ocpsoft.rewrite.gwt.client.history.ContextPathListener;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
/**
* Ensure that the context path must be set before we are allowed to continue loading the application.
@@ -1,11 +1,12 @@
package com.ocpsoft.socialpm.gwt.client.local.view.component;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.ui.Anchor;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
public class NavLink extends Anchor
{
@@ -4,8 +4,9 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.event.Observes;
-import com.ocpsoft.rewrite.gwt.client.history.ContextPathListener;
-import com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
+import org.ocpsoft.rewrite.gwt.client.history.ContextPathListener;
+import org.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl;
+
import com.ocpsoft.socialpm.gwt.client.local.history.HistoryConstants;
import com.ocpsoft.socialpm.gwt.client.local.view.events.LoginEvent;
import com.ocpsoft.socialpm.gwt.client.local.view.events.LogoutEvent;
@@ -2,18 +2,18 @@
import javax.servlet.ServletContext;
-import com.ocpsoft.logging.Logger;
-import com.ocpsoft.rewrite.config.Configuration;
-import com.ocpsoft.rewrite.config.ConfigurationBuilder;
-import com.ocpsoft.rewrite.context.EvaluationContext;
-import com.ocpsoft.rewrite.servlet.config.DispatchType;
-import com.ocpsoft.rewrite.servlet.config.Forward;
-import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider;
-import com.ocpsoft.rewrite.servlet.config.HttpOperation;
-import com.ocpsoft.rewrite.servlet.config.Path;
-import com.ocpsoft.rewrite.servlet.config.Resource;
-import com.ocpsoft.rewrite.servlet.config.ServletMapping;
-import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite;
+import org.ocpsoft.logging.Logger;
+import org.ocpsoft.rewrite.config.Configuration;
+import org.ocpsoft.rewrite.config.ConfigurationBuilder;
+import org.ocpsoft.rewrite.context.EvaluationContext;
+import org.ocpsoft.rewrite.servlet.config.DispatchType;
+import org.ocpsoft.rewrite.servlet.config.Forward;
+import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider;
+import org.ocpsoft.rewrite.servlet.config.HttpOperation;
+import org.ocpsoft.rewrite.servlet.config.Path;
+import org.ocpsoft.rewrite.servlet.config.Resource;
+import org.ocpsoft.rewrite.servlet.config.ServletMapping;
+import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite;
public class HistoryRewriteConfiguration extends HttpConfigurationProvider
{
@@ -19,9 +19,9 @@
import org.jboss.seam.security.events.LoginFailedEvent;
import org.jboss.seam.security.external.openid.OpenIdAuthenticator;
import org.jboss.seam.security.management.IdmAuthenticator;
+import org.ocpsoft.logging.Logger;
import org.picketlink.idm.api.User;
-import com.ocpsoft.logging.Logger;
import com.ocpsoft.socialpm.gwt.client.shared.rpc.AuthenticationService;
import com.ocpsoft.socialpm.gwt.client.shared.rpc.ProfileService;
import com.ocpsoft.socialpm.gwt.server.util.PersistenceUtil;
@@ -10,8 +10,8 @@
import javax.persistence.TypedQuery;
import org.jboss.errai.bus.server.annotations.Service;
+import org.ocpsoft.logging.Logger;
-import com.ocpsoft.logging.Logger;
import com.ocpsoft.socialpm.gwt.client.shared.rpc.ProfileService;
import com.ocpsoft.socialpm.gwt.server.util.HibernateDetachUtility;
import com.ocpsoft.socialpm.gwt.server.util.HibernateDetachUtility.SerializationType;
@@ -45,9 +45,8 @@
import javax.persistence.PersistenceContextType;
import org.jboss.errai.bus.server.annotations.Service;
-import org.jboss.seam.security.annotations.LoggedIn;
+import org.ocpsoft.common.util.Assert;
-import com.ocpsoft.common.util.Assert;
import com.ocpsoft.socialpm.gwt.client.shared.rpc.ProjectService;
import com.ocpsoft.socialpm.gwt.server.security.authorization.ProfileBinding;
import com.ocpsoft.socialpm.gwt.server.security.authorization.ProjectAdmin;
@@ -4,8 +4,7 @@
import org.jboss.solder.exception.control.CaughtException;
import org.jboss.solder.exception.control.Handles;
import org.jboss.solder.exception.control.HandlesExceptions;
-
-import com.ocpsoft.logging.Logger;
+import org.ocpsoft.logging.Logger;
@HandlesExceptions
public class AuthenticationExceptionHandler
View
@@ -34,6 +34,18 @@
<artifactId>seam-security-external</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.solder</groupId>
+ <artifactId>solder-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.solder</groupId>
+ <artifactId>solder-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.solder</groupId>
+ <artifactId>solder-logging</artifactId>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
Oops, something went wrong.

0 comments on commit 4d81fc8

Please sign in to comment.