Author: gk
Date: Thu Aug 11 13:55:39 2016
New Revision: 1755986
URL: http://svn.apache.org/viewvc?rev=1755986&view=rev
Log:
- add interface to mark delegate
Added:
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUserDelegate.java
(with props)
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1755986&r1=1755985&r2=1755986&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Aug 11 13:55:39 2016
@@ -510,6 +510,7 @@
<configuration>
<!--default setting is forkCount=1/reuseForks=true -->
<reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
</configuration>
</plugin>
<plugin>
Modified:
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java?rev=1755986&r1=1755985&r2=1755986&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
Thu Aug 11 13:55:39 2016
@@ -42,7 +42,7 @@ import org.apache.turbine.util.ObjectUti
* @version $Id: TorqueUser.java 1199856 2011-11-09 17:06:04Z tv $
*/
-public class DefaultUserImpl implements User
+public class DefaultUserImpl implements User, TurbineUserDelegate
{
/** Serial version */
private static final long serialVersionUID = -1866504873085624111L;
@@ -735,22 +735,20 @@ public class DefaultUserImpl implements
setLastLogin(new java.util.Date());
}
- /**
- * Get the delegated user
- *
- * @return the userDelegate
- */
- public TurbineUser getUserDelegate()
+ /* (non-Javadoc)
+ * @see org.apache.turbine.om.security.UserDelegate#getUserDelegate()
+ */
+ @Override
+ public TurbineUser getUserDelegate()
{
return userDelegate;
}
- /**
- * Set the delegated user
- *
- * @param userDelegate the userDelegate to set
- */
- public void setUserDelegate(TurbineUser userDelegate)
+ /* (non-Javadoc)
+ * @see
org.apache.turbine.om.security.UserDelegate#setUserDelegate(org.apache.fulcrum.security.model.turbine.entity.TurbineUser)
+ */
+ @Override
+ public void setUserDelegate(TurbineUser userDelegate)
{
this.userDelegate = userDelegate;
}
Added:
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUserDelegate.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUserDelegate.java?rev=1755986&view=auto
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUserDelegate.java
(added)
+++
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUserDelegate.java
Thu Aug 11 13:55:39 2016
@@ -0,0 +1,45 @@
+package org.apache.turbine.om.security;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
+
+/**
+ * Marker interface
+ *
+ * @author gkallidis
+ *
+ */
+public interface TurbineUserDelegate {
+
+ /**
+ * Get the delegated user
+ *
+ * @return the userDelegate
+ */
+ public abstract TurbineUser getUserDelegate();
+
+ /**
+ * Set the delegated user
+ *
+ * @param userDelegate the userDelegate to set
+ */
+ public abstract void setUserDelegate(TurbineUser userDelegate);
+
+}
\ No newline at end of file
Propchange:
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUserDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java?rev=1755986&r1=1755985&r2=1755986&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
Thu Aug 11 13:55:39 2016
@@ -35,6 +35,7 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.UserSet;
import org.apache.turbine.om.security.DefaultUserImpl;
import org.apache.turbine.om.security.User;
+import org.apache.turbine.om.security.TurbineUserDelegate;
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.ObjectUtils;
@@ -208,7 +209,7 @@ public class DefaultUserManager implemen
throw new DataBackendException("Could not serialize permanent
storage", e);
}
- umDelegate.saveUser(((DefaultUserImpl)user).getUserDelegate());
+ umDelegate.saveUser(((TurbineUserDelegate)user).getUserDelegate());
}
/**
@@ -302,7 +303,7 @@ public class DefaultUserManager implemen
DataBackendException
{
umDelegate.changePassword(
- ((DefaultUserImpl)user).getUserDelegate(),
+ ((TurbineUserDelegate)user).getUserDelegate(),
oldPassword, newPassword);
}
