Skip to content

Commit

Permalink
Fixing spring contexts and test package names.
Browse files Browse the repository at this point in the history
  • Loading branch information
semancik committed May 20, 2014
1 parent 89675e2 commit 25325ee
Show file tree
Hide file tree
Showing 53 changed files with 179 additions and 131 deletions.
60 changes: 30 additions & 30 deletions model/model-impl/src/main/resources/ctx-model.xml
Expand Up @@ -40,7 +40,7 @@

<!-- enabling annotation driven configuration -->
<context:annotation-config/>
<context:component-scan base-package="com.evolveum.midpoint.model"/>
<context:component-scan base-package="com.evolveum.midpoint.model.impl"/>
<context:spring-configured/>

<bean id="basicFunctionObject" class="com.evolveum.midpoint.model.common.expression.functions.BasicExpressionFunctions"
Expand Down Expand Up @@ -231,68 +231,68 @@
</property>
</bean>

<bean id="actionManager" class="com.evolveum.midpoint.model.sync.ActionManagerImpl">
<bean id="actionManager" class="com.evolveum.midpoint.model.impl.sync.ActionManagerImpl">
<property name="actionMapping">
<map>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#link">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.LinkAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.LinkAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.AddFocusAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.AddFocusAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteFocusAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.DeleteFocusAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.UnlinkAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.UnlinkAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteShadow">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteShadowAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.DeleteShadowAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#inactivateShadow">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateShadowAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.InactivateShadowAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#inactivateFocus">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateFocusAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.InactivateFocusAction</value>
</entry>


<!-- DEPRECATED. for compatibility only. -->
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#linkAccount">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.LinkAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.LinkAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#modifyUser">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.EmptyAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.EmptyAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#synchronize">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.EmptyAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.EmptyAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addUser">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.AddFocusAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.AddFocusAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteUser">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteFocusAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.DeleteFocusAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlinkAccount">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.UnlinkAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.UnlinkAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteAccount">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.DeleteShadowAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.DeleteShadowAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#disableAccount">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateShadowAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.InactivateShadowAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#disableUser">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.InactivateFocusAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.InactivateFocusAction</value>
</entry>

<!-- TODO -->
<!--
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#enableUser">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.EnableUserAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.EnableUserAction</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addAccount">
<value type="java.lang.Class">com.evolveum.midpoint.model.sync.action.AddAccountAction</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.sync.action.AddAccountAction</value>
</entry>
-->
</map>
Expand Down Expand Up @@ -324,13 +324,13 @@
<property name="filterMapping">
<map>
<entry key="http://midpoint.evolveum.com/xml/ns/public/common/value-filter-1.xsd#emptyFilter">
<value type="java.lang.Class">com.evolveum.midpoint.model.filter.EmptyFilter</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.filter.EmptyFilter</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/common/value-filter-1.xsd#patternFilter">
<value type="java.lang.Class">com.evolveum.midpoint.model.filter.PatternFilter</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.filter.PatternFilter</value>
</entry>
<entry key="http://midpoint.evolveum.com/xml/ns/public/common/value-filter-1.xsd#diacriticsFilter">
<value type="java.lang.Class">com.evolveum.midpoint.model.filter.DiacriticsFilter</value>
<value type="java.lang.Class">com.evolveum.midpoint.model.impl.filter.DiacriticsFilter</value>
</entry>
</map>
</property>
Expand Down Expand Up @@ -394,10 +394,10 @@

</jaxrs:server>

<bean id="modelRestService" class="com.evolveum.midpoint.model.ModelRestService"/>
<bean id="jaxbProvider" class="com.evolveum.midpoint.model.rest.MidpointXmlProvider"/>
<!-- <bean id="jsonProvider" class="com.evolveum.midpoint.model.rest.MidpointJsonProvider"/> -->
<bean id="restAuthenticationHandler" class="com.evolveum.midpoint.model.security.MidpointRestAuthenticationHandler"/>
<bean id="modelRestService" class="com.evolveum.midpoint.model.impl.ModelRestService"/>
<bean id="jaxbProvider" class="com.evolveum.midpoint.model.impl.rest.MidpointXmlProvider"/>
<!-- <bean id="jsonProvider" class="com.evolveum.midpoint.model.impl.rest.MidpointJsonProvider"/> -->
<bean id="restAuthenticationHandler" class="com.evolveum.midpoint.model.impl.security.MidpointRestAuthenticationHandler"/>

<bean id="authenticationInterceptor" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
Expand All @@ -411,18 +411,18 @@
</constructor-arg>
</bean>

<bean id="springAuthenticationInjector" class="com.evolveum.midpoint.model.security.SpringAuthenticationInjectorInterceptor">
<bean id="springAuthenticationInjector" class="com.evolveum.midpoint.model.impl.security.SpringAuthenticationInjectorInterceptor">
<constructor-arg name="userDetailsService" ref="userDetailsService"/>
<constructor-arg name="securityEnforcer" ref="securityEnforcer"/>
<constructor-arg name="auditService" ref="auditService"/>
<constructor-arg name="taskManager" ref="taskManager"/>
</bean>

<bean id="springAuthenticationJanitor" class="com.evolveum.midpoint.model.security.SpringAuthenticationJanitorInterceptor">
<bean id="springAuthenticationJanitor" class="com.evolveum.midpoint.model.impl.security.SpringAuthenticationJanitorInterceptor">
</bean>


<bean id="passwordCallback" class="com.evolveum.midpoint.model.security.PasswordCallback">
<bean id="passwordCallback" class="com.evolveum.midpoint.model.impl.security.PasswordCallback">
<constructor-arg name="userDetailsService" ref="userDetailsService"/>
<constructor-arg name="protector" ref="protector"/>
</bean>
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model;
package com.evolveum.midpoint.model.impl;

import static com.evolveum.midpoint.test.IntegrationTestTools.display;
import static org.testng.AssertJUnit.assertEquals;
Expand All @@ -40,8 +40,8 @@
import com.evolveum.midpoint.model.impl.lens.LensContext;
import com.evolveum.midpoint.model.impl.lens.LensFocusContext;
import com.evolveum.midpoint.model.impl.lens.LensProjectionContext;
import com.evolveum.midpoint.model.impl.util.mock.MockClockworkHook;
import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
import com.evolveum.midpoint.model.util.mock.MockClockworkHook;
import com.evolveum.midpoint.prism.Item;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismPropertyValue;
Expand Down
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package com.evolveum.midpoint.model;
package com.evolveum.midpoint.model.impl;

import com.evolveum.midpoint.model.util.ModelTUtil;
import com.evolveum.midpoint.model.impl.util.ModelTUtil;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.util.JaxbTestUtil;
import com.evolveum.midpoint.prism.util.PrismTestUtil;
Expand Down
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.evolveum.midpoint.model;
package com.evolveum.midpoint.model.impl;

import static org.testng.AssertJUnit.assertNotNull;
import org.testng.annotations.Test;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import static com.evolveum.midpoint.test.IntegrationTestTools.display;
import static org.mockito.Matchers.any;
Expand Down Expand Up @@ -43,8 +43,8 @@

import com.evolveum.midpoint.model.api.PolicyViolationException;
import com.evolveum.midpoint.model.impl.ModelCrudService;
import com.evolveum.midpoint.model.util.ModelTUtil;
import com.evolveum.midpoint.model.util.ObjectTypeNameMatcher;
import com.evolveum.midpoint.model.impl.util.ModelTUtil;
import com.evolveum.midpoint.model.impl.util.ObjectTypeNameMatcher;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.util.PrismAsserts;
import com.evolveum.midpoint.prism.util.PrismTestUtil;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import javax.xml.namespace.QName;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import java.util.ArrayList;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import com.evolveum.midpoint.model.impl.controller.ModelController;
import com.evolveum.midpoint.prism.query.ObjectPaging;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertNotNull;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.controller;
package com.evolveum.midpoint.model.impl.controller;

import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.expr;
package com.evolveum.midpoint.model.impl.expr;

import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.expr;
package com.evolveum.midpoint.model.impl.expr;

import static com.evolveum.midpoint.test.IntegrationTestTools.display;
import static org.testng.AssertJUnit.assertEquals;
Expand All @@ -37,10 +37,10 @@
import org.testng.annotations.Test;
import org.xml.sax.SAXException;

import com.evolveum.midpoint.model.AbstractInternalModelIntegrationTest;
import com.evolveum.midpoint.model.common.expression.ExpressionVariables;
import com.evolveum.midpoint.model.common.expression.script.ScriptExpression;
import com.evolveum.midpoint.model.common.expression.script.ScriptExpressionFactory;
import com.evolveum.midpoint.model.impl.AbstractInternalModelIntegrationTest;
import com.evolveum.midpoint.model.impl.controller.ModelController;
import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
import com.evolveum.midpoint.prism.ItemDefinition;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.filter;
package com.evolveum.midpoint.model.impl.filter;

import com.evolveum.midpoint.common.filter.Filter;
import com.evolveum.midpoint.model.impl.filter.DiacriticsFilter;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.filter;
package com.evolveum.midpoint.model.impl.filter;

import static org.testng.AssertJUnit.assertEquals;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.filter;
package com.evolveum.midpoint.model.impl.filter;

import com.evolveum.midpoint.common.filter.Filter;
import com.evolveum.midpoint.model.impl.filter.PatternFilter;
Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.lens;
package com.evolveum.midpoint.model.impl.lens;

import static com.evolveum.midpoint.test.IntegrationTestTools.display;
import static org.testng.AssertJUnit.assertEquals;
Expand All @@ -38,7 +38,7 @@
import org.testng.AssertJUnit;
import org.testng.annotations.Test;

import com.evolveum.midpoint.model.AbstractInternalModelIntegrationTest;
import com.evolveum.midpoint.model.impl.AbstractInternalModelIntegrationTest;
import com.evolveum.midpoint.model.impl.lens.projector.Projector;
import com.evolveum.midpoint.task.api.TaskManager;

Expand Down
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.evolveum.midpoint.model.lens;
package com.evolveum.midpoint.model.impl.lens;

import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
Expand All @@ -31,8 +31,8 @@

import com.evolveum.midpoint.common.ActivationComputer;
import com.evolveum.midpoint.common.Clock;
import com.evolveum.midpoint.model.AbstractInternalModelIntegrationTest;
import com.evolveum.midpoint.model.common.expression.ObjectDeltaObject;
import com.evolveum.midpoint.model.impl.AbstractInternalModelIntegrationTest;
import com.evolveum.midpoint.model.impl.lens.AssignmentEvaluator;
import com.evolveum.midpoint.model.impl.lens.EvaluatedAssignment;
import com.evolveum.midpoint.prism.PrismContainer;
Expand Down

0 comments on commit 25325ee

Please sign in to comment.