You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/01/21 12:28:00 UTC
svn commit: r1436279 - in /syncope/trunk/core/src: main/resources/
test/resources/
Author: ilgrosso
Date: Mon Jan 21 11:28:00 2013
New Revision: 1436279
URL: http://svn.apache.org/viewvc?rev=1436279&view=rev
Log:
Bare XML formatting
Modified:
syncope/trunk/core/src/main/resources/activiticontent.xml
syncope/trunk/core/src/main/resources/audit.xml
syncope/trunk/core/src/main/resources/content.xml
syncope/trunk/core/src/main/resources/indexes.xml
syncope/trunk/core/src/main/resources/logback.xml
syncope/trunk/core/src/main/resources/persistenceContext.xml
syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml
syncope/trunk/core/src/main/resources/restContext.xml
syncope/trunk/core/src/main/resources/schedulingContext.xml
syncope/trunk/core/src/main/resources/securityContext.xml
syncope/trunk/core/src/main/resources/syncopeContext.xml
syncope/trunk/core/src/main/resources/workflowContext.xml
syncope/trunk/core/src/test/resources/content.xml
syncope/trunk/core/src/test/resources/context.xml
syncope/trunk/core/src/test/resources/persistenceTestEnv.xml
syncope/trunk/core/src/test/resources/restClientContext.xml
syncope/trunk/core/src/test/resources/testJDBCContext.xml
Modified: syncope/trunk/core/src/main/resources/activiticontent.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/activiticontent.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/activiticontent.xml (original)
+++ syncope/trunk/core/src/main/resources/activiticontent.xml Mon Jan 21 11:28:00 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<dataset>
<ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}" REV_="1"/>
Modified: syncope/trunk/core/src/main/resources/audit.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/audit.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/audit.xml (original)
+++ syncope/trunk/core/src/main/resources/audit.xml Mon Jan 21 11:28:00 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<included>
<property resource="persistence.properties"/>
Modified: syncope/trunk/core/src/main/resources/content.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/content.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/content.xml (original)
+++ syncope/trunk/core/src/main/resources/content.xml Mon Jan 21 11:28:00 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<dataset>
<SyncopeConf confKey="connid.bundles.directory" confValue="${bundles.directory}"/>
Modified: syncope/trunk/core/src/main/resources/indexes.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/indexes.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/indexes.xml (original)
+++ syncope/trunk/core/src/main/resources/indexes.xml Mon Jan 21 11:28:00 2013
@@ -16,62 +16,61 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<comment>Additional indexes (in respect to JPA's)</comment>
- <!-- These indexes are not needed by OpenJPA, only by Hibernate
- <entry key="roleNameIndex">CREATE INDEX roleNameIndex ON SyncopeRole(name)</entry>
- <entry key="ConnInstance_capabilities_Index_1">CREATE INDEX ConnInstance_ca_Index_1 ON ConnInstance_capabilities(ConnInstance_id)</entry>
- <entry key="ExternalResource_Index_2">CREATE INDEX ExternalResourc_Index_2 ON ExternalResource(connector_id)</entry>
- <entry key="ExternalResource_Index_3">CREATE INDEX ExternalResourc_Index_3 ON ExternalResource(accountPolicy_id)</entry>
- <entry key="ExternalResource_Index_4">CREATE INDEX ExternalResourc_Index_4 ON ExternalResource(passwordPolicy_id)</entry>
- <entry key="ExternalResource_Index_5">CREATE INDEX ExternalResourc_Index_5 ON ExternalResource(syncPolicy_id)</entry>
- <entry key="MAttr_Index_6">CREATE INDEX MAttr_Index_6 ON MAttr(schema_name)</entry>
- <entry key="MAttr_Index_7">CREATE INDEX MAttr_Index_7 ON MAttr(owner_id)</entry>
- <entry key="MAttrUniqueValue_Index_9">CREATE INDEX MAttrUniqueValu_Index_9 ON MAttrUniqueValue(schema_name)</entry>
- <entry key="MAttrValue_Index_10">CREATE INDEX MAttrValue_Index_10 ON MAttrValue(attribute_id)</entry>
- <entry key="MDerAttr_Index_11">CREATE INDEX MDerAttr_Index_11 ON MDerAttr(derivedSchema_name)</entry>
- <entry key="MDerAttr_Index_12">CREATE INDEX MDerAttr_Index_12 ON MDerAttr(owner_id)</entry>
- <entry key="MVirAttr_Index_13">CREATE INDEX MVirAttr_Index_13 ON MVirAttr(virtualSchema_name)</entry>
- <entry key="MVirAttr_Index_14">CREATE INDEX MVirAttr_Index_14 ON MVirAttr(owner_id)</entry>
- <entry key="Membership_Index_15">CREATE INDEX Membership_Index_15 ON Membership(syncopeUser_id)</entry>
- <entry key="Membership_Index_16">CREATE INDEX Membership_Index_16 ON Membership(syncopeRole_id)</entry>
- <entry key="NotificationTask_recipients_Index_19">CREATE INDEX NotificationTas_Index_19 ON NotificationTask_recipients(NotificationTask_id)</entry>
- <entry key="Notification_events_Index_20">CREATE INDEX Notification_ev_Index_20 ON Notification_events(Notification_id)</entry>
- <entry key="RAttr_Index_21">CREATE INDEX RAttr_Index_21 ON RAttr(schema_name)</entry>
- <entry key="RAttr_Index_22">CREATE INDEX RAttr_Index_22 ON RAttr(owner_id)</entry>
- <entry key="RAttrUniqueValue_Index_24">CREATE INDEX RAttrUniqueValu_Index_24 ON RAttrUniqueValue(schema_name)</entry>
- <entry key="RAttrValue_Index_25">CREATE INDEX RAttrValue_Index_25 ON RAttrValue(attribute_id)</entry>
- <entry key="RDerAttr_Index_26">CREATE INDEX RDerAttr_Index_26 ON RDerAttr(derivedSchema_name)</entry>
- <entry key="RDerAttr_Index_27">CREATE INDEX RDerAttr_Index_27 ON RDerAttr(owner_id)</entry>
- <entry key="RVirAttr_Index_28">CREATE INDEX RVirAttr_Index_28 ON RVirAttr(virtualSchema_name)</entry>
- <entry key="RVirAttr_Index_29">CREATE INDEX RVirAttr_Index_29 ON RVirAttr(owner_id)</entry>
- <entry key="SchemaMapping_Index_30">CREATE INDEX SchemaMapping_Index_30 ON SchemaMapping(resource_name)</entry>
- <entry key="SyncopeRole_Index_31">CREATE INDEX SyncopeRole_Index_31 ON SyncopeRole(accountPolicy_id)</entry>
- <entry key="SyncopeRole_Index_32">CREATE INDEX SyncopeRole_Index_32 ON SyncopeRole(passwordPolicy_id)</entry>
- <entry key="SyncopeRole_Index_33">CREATE INDEX SyncopeRole_Index_33 ON SyncopeRole(parent_id)</entry>
- <entry key="SyncopeRole_Entitlement_Index_34">CREATE INDEX SyncopeRole_Ent_Index_34 ON SyncopeRole_Entitlement(entitlement_name)</entry>
- <entry key="SyncopeRole_Entitlement_Index_35">CREATE INDEX SyncopeRole_Ent_Index_35 ON SyncopeRole_Entitlement(role_id)</entry>
- <entry key="SyncopeRole_ExternalResource_Index_36">CREATE INDEX SyncopeRole_Ext_Index_36 ON SyncopeRole_ExternalResource(resource_name)</entry>
- <entry key="SyncopeRole_ExternalResource_Index_37">CREATE INDEX SyncopeRole_Ext_Index_37 ON SyncopeRole_ExternalResource(role_id)</entry>
- <entry key="SyncopeUser_ExternalResource_Index_38">CREATE INDEX SyncopeUser_Ext_Index_38 ON SyncopeUser_ExternalResource(resource_name)</entry>
- <entry key="SyncopeUser_ExternalResource_Index_39">CREATE INDEX SyncopeUser_Ext_Index_39 ON SyncopeUser_ExternalResource(user_id)</entry>
- <entry key="SyncopeUser_passwordHistory_Index_40">CREATE INDEX SyncopeUser_pas_Index_40 ON SyncopeUser_passwordHistory(SyncopeUser_id)</entry>
- <entry key="Task_Index_41">CREATE INDEX Task_Index_41 ON Task(syncopeUser_id)</entry>
- <entry key="Task_Index_42">CREATE INDEX Task_Index_42 ON Task(resource_name)</entry>
- <entry key="TaskExec_Index_43">CREATE INDEX TaskExec_Index_43 ON TaskExec(task_id)</entry>
- <entry key="UAttr_Index_44">CREATE INDEX UAttr_Index_44 ON UAttr(schema_name)</entry>
- <entry key="UAttr_Index_45">CREATE INDEX UAttr_Index_45 ON UAttr(owner_id)</entry>
- <entry key="UAttrUniqueValue_Index_47">CREATE INDEX UAttrUniqueValu_Index_47 ON UAttrUniqueValue(schema_name)</entry>
- <entry key="UAttrValue_Index_48">CREATE INDEX UAttrValue_Index_48 ON UAttrValue(attribute_id)</entry>
- <entry key="UDerAttr_Index_49">CREATE INDEX UDerAttr_Index_49 ON UDerAttr(derivedSchema_name)</entry>
- <entry key="UDerAttr_Index_50">CREATE INDEX UDerAttr_Index_50 ON UDerAttr(owner_id)</entry>
- <entry key="UVirAttr_Index_51">CREATE INDEX UVirAttr_Index_51 ON UVirAttr(virtualSchema_name)</entry>
- <entry key="UVirAttr_Index_52">CREATE INDEX UVirAttr_Index_52 ON UVirAttr(owner_id)</entry>
- -->
+ <!-- These indexes are not needed by OpenJPA, only by Hibernate
+ <entry key="roleNameIndex">CREATE INDEX roleNameIndex ON SyncopeRole(name)</entry>
+ <entry key="ConnInstance_capabilities_Index_1">CREATE INDEX ConnInstance_ca_Index_1 ON ConnInstance_capabilities(ConnInstance_id)</entry>
+ <entry key="ExternalResource_Index_2">CREATE INDEX ExternalResourc_Index_2 ON ExternalResource(connector_id)</entry>
+ <entry key="ExternalResource_Index_3">CREATE INDEX ExternalResourc_Index_3 ON ExternalResource(accountPolicy_id)</entry>
+ <entry key="ExternalResource_Index_4">CREATE INDEX ExternalResourc_Index_4 ON ExternalResource(passwordPolicy_id)</entry>
+ <entry key="ExternalResource_Index_5">CREATE INDEX ExternalResourc_Index_5 ON ExternalResource(syncPolicy_id)</entry>
+ <entry key="MAttr_Index_6">CREATE INDEX MAttr_Index_6 ON MAttr(schema_name)</entry>
+ <entry key="MAttr_Index_7">CREATE INDEX MAttr_Index_7 ON MAttr(owner_id)</entry>
+ <entry key="MAttrUniqueValue_Index_9">CREATE INDEX MAttrUniqueValu_Index_9 ON MAttrUniqueValue(schema_name)</entry>
+ <entry key="MAttrValue_Index_10">CREATE INDEX MAttrValue_Index_10 ON MAttrValue(attribute_id)</entry>
+ <entry key="MDerAttr_Index_11">CREATE INDEX MDerAttr_Index_11 ON MDerAttr(derivedSchema_name)</entry>
+ <entry key="MDerAttr_Index_12">CREATE INDEX MDerAttr_Index_12 ON MDerAttr(owner_id)</entry>
+ <entry key="MVirAttr_Index_13">CREATE INDEX MVirAttr_Index_13 ON MVirAttr(virtualSchema_name)</entry>
+ <entry key="MVirAttr_Index_14">CREATE INDEX MVirAttr_Index_14 ON MVirAttr(owner_id)</entry>
+ <entry key="Membership_Index_15">CREATE INDEX Membership_Index_15 ON Membership(syncopeUser_id)</entry>
+ <entry key="Membership_Index_16">CREATE INDEX Membership_Index_16 ON Membership(syncopeRole_id)</entry>
+ <entry key="NotificationTask_recipients_Index_19">CREATE INDEX NotificationTas_Index_19 ON NotificationTask_recipients(NotificationTask_id)</entry>
+ <entry key="Notification_events_Index_20">CREATE INDEX Notification_ev_Index_20 ON Notification_events(Notification_id)</entry>
+ <entry key="RAttr_Index_21">CREATE INDEX RAttr_Index_21 ON RAttr(schema_name)</entry>
+ <entry key="RAttr_Index_22">CREATE INDEX RAttr_Index_22 ON RAttr(owner_id)</entry>
+ <entry key="RAttrUniqueValue_Index_24">CREATE INDEX RAttrUniqueValu_Index_24 ON RAttrUniqueValue(schema_name)</entry>
+ <entry key="RAttrValue_Index_25">CREATE INDEX RAttrValue_Index_25 ON RAttrValue(attribute_id)</entry>
+ <entry key="RDerAttr_Index_26">CREATE INDEX RDerAttr_Index_26 ON RDerAttr(derivedSchema_name)</entry>
+ <entry key="RDerAttr_Index_27">CREATE INDEX RDerAttr_Index_27 ON RDerAttr(owner_id)</entry>
+ <entry key="RVirAttr_Index_28">CREATE INDEX RVirAttr_Index_28 ON RVirAttr(virtualSchema_name)</entry>
+ <entry key="RVirAttr_Index_29">CREATE INDEX RVirAttr_Index_29 ON RVirAttr(owner_id)</entry>
+ <entry key="SchemaMapping_Index_30">CREATE INDEX SchemaMapping_Index_30 ON SchemaMapping(resource_name)</entry>
+ <entry key="SyncopeRole_Index_31">CREATE INDEX SyncopeRole_Index_31 ON SyncopeRole(accountPolicy_id)</entry>
+ <entry key="SyncopeRole_Index_32">CREATE INDEX SyncopeRole_Index_32 ON SyncopeRole(passwordPolicy_id)</entry>
+ <entry key="SyncopeRole_Index_33">CREATE INDEX SyncopeRole_Index_33 ON SyncopeRole(parent_id)</entry>
+ <entry key="SyncopeRole_Entitlement_Index_34">CREATE INDEX SyncopeRole_Ent_Index_34 ON SyncopeRole_Entitlement(entitlement_name)</entry>
+ <entry key="SyncopeRole_Entitlement_Index_35">CREATE INDEX SyncopeRole_Ent_Index_35 ON SyncopeRole_Entitlement(role_id)</entry>
+ <entry key="SyncopeRole_ExternalResource_Index_36">CREATE INDEX SyncopeRole_Ext_Index_36 ON SyncopeRole_ExternalResource(resource_name)</entry>
+ <entry key="SyncopeRole_ExternalResource_Index_37">CREATE INDEX SyncopeRole_Ext_Index_37 ON SyncopeRole_ExternalResource(role_id)</entry>
+ <entry key="SyncopeUser_ExternalResource_Index_38">CREATE INDEX SyncopeUser_Ext_Index_38 ON SyncopeUser_ExternalResource(resource_name)</entry>
+ <entry key="SyncopeUser_ExternalResource_Index_39">CREATE INDEX SyncopeUser_Ext_Index_39 ON SyncopeUser_ExternalResource(user_id)</entry>
+ <entry key="SyncopeUser_passwordHistory_Index_40">CREATE INDEX SyncopeUser_pas_Index_40 ON SyncopeUser_passwordHistory(SyncopeUser_id)</entry>
+ <entry key="Task_Index_41">CREATE INDEX Task_Index_41 ON Task(syncopeUser_id)</entry>
+ <entry key="Task_Index_42">CREATE INDEX Task_Index_42 ON Task(resource_name)</entry>
+ <entry key="TaskExec_Index_43">CREATE INDEX TaskExec_Index_43 ON TaskExec(task_id)</entry>
+ <entry key="UAttr_Index_44">CREATE INDEX UAttr_Index_44 ON UAttr(schema_name)</entry>
+ <entry key="UAttr_Index_45">CREATE INDEX UAttr_Index_45 ON UAttr(owner_id)</entry>
+ <entry key="UAttrUniqueValue_Index_47">CREATE INDEX UAttrUniqueValu_Index_47 ON UAttrUniqueValue(schema_name)</entry>
+ <entry key="UAttrValue_Index_48">CREATE INDEX UAttrValue_Index_48 ON UAttrValue(attribute_id)</entry>
+ <entry key="UDerAttr_Index_49">CREATE INDEX UDerAttr_Index_49 ON UDerAttr(derivedSchema_name)</entry>
+ <entry key="UDerAttr_Index_50">CREATE INDEX UDerAttr_Index_50 ON UDerAttr(owner_id)</entry>
+ <entry key="UVirAttr_Index_51">CREATE INDEX UVirAttr_Index_51 ON UVirAttr(virtualSchema_name)</entry>
+ <entry key="UVirAttr_Index_52">CREATE INDEX UVirAttr_Index_52 ON UVirAttr(owner_id)</entry>
+ -->
<entry key="UAttrValue_stringvalueIndex">CREATE INDEX UAttrValue_stringvalueIndex ON UAttrValue(stringvalue)</entry>
<entry key="UAttrValue_datevalueIndex">CREATE INDEX UAttrValue_datevalueIndex ON UAttrValue(datevalue)</entry>
Modified: syncope/trunk/core/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/logback.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/logback.xml (original)
+++ syncope/trunk/core/src/main/resources/logback.xml Mon Jan 21 11:28:00 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<configuration>
Modified: syncope/trunk/core/src/main/resources/persistenceContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/persistenceContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/persistenceContext.xml (original)
+++ syncope/trunk/core/src/main/resources/persistenceContext.xml Mon Jan 21 11:28:00 2013
@@ -16,60 +16,60 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop.xsd"
->
-
- <import resource="persistenceContextEMFactory.xml" />
-
- <context:annotation-config />
- <context:component-scan base-package="org.apache.syncope.core.persistence" />
- <context:component-scan base-package="org.apache.syncope.core.util" />
- <context:component-scan base-package="org.apache.syncope.core.policy" />
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop.xsd">
+
+ <import resource="persistenceContextEMFactory.xml"/>
+
+ <context:annotation-config/>
+ <context:component-scan base-package="org.apache.syncope.core.persistence"/>
+ <context:component-scan base-package="org.apache.syncope.core.util"/>
+ <context:component-scan base-package="org.apache.syncope.core.policy"/>
- <aop:aspectj-autoproxy />
+ <aop:aspectj-autoproxy/>
- <bean id="xStream" class="com.thoughtworks.xstream.XStream" />
+ <bean id="xStream" class="com.thoughtworks.xstream.XStream"/>
<!-- Use JNDI datasource as default but, when not available, revert to
- local datasource, with different properties for execution and testing.
- In any case, get all JDBC connections with a determined isolation level. -->
- <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
- <property name="jndiName" value="java:comp/env/jdbc/syncopeDataSource" />
- <property name="defaultObject" ref="localDataSource" />
- </bean>
-
- <bean id="localDataSource" class="org.springframework.jdbc.datasource.IsolationLevelDataSourceAdapter">
- <property name="targetDataSource">
- <bean class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="${jpa.driverClassName}" />
- <property name="url" value="${jpa.url}" />
- <property name="username" value="${jpa.username}" />
- <property name="password" value="${jpa.password}" />
- </bean>
- </property>
- <property name="isolationLevelName" value="ISOLATION_READ_COMMITTED" />
- </bean>
-
- <bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
- <property name="entityManagerFactory" ref="entityManagerFactory" />
- </bean>
-
- <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory" />
- </bean>
- <tx:annotation-driven />
+ local datasource, with different properties for execution and testing.
+ In any case, get all JDBC connections with a determined isolation level. -->
+ <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName" value="java:comp/env/jdbc/syncopeDataSource"/>
+ <property name="defaultObject" ref="localDataSource"/>
+ </bean>
+
+ <bean id="localDataSource" class="org.springframework.jdbc.datasource.IsolationLevelDataSourceAdapter">
+ <property name="targetDataSource">
+ <bean class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="driverClassName" value="${jpa.driverClassName}"/>
+ <property name="url" value="${jpa.url}"/>
+ <property name="username" value="${jpa.username}"/>
+ <property name="password" value="${jpa.password}"/>
+ </bean>
+ </property>
+ <property name="isolationLevelName" value="ISOLATION_READ_COMMITTED"/>
+ </bean>
+
+ <bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
+ <property name="entityManagerFactory" ref="entityManagerFactory"/>
+ </bean>
+
+ <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="entityManagerFactory"/>
+ </bean>
+ <tx:annotation-driven/>
- <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />
+ <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
</beans>
Modified: syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml (original)
+++ syncope/trunk/core/src/main/resources/persistenceContextEMFactory.xml Mon Jan 21 11:28:00 2013
@@ -20,7 +20,7 @@ under the License.
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
@@ -37,8 +37,8 @@ under the License.
<property name="jpaPropertyMap">
<map>
<!--<entry key="openjpa.Log" value="SQL=TRACE"/>
- <entry key="openjpa.ConnectionFactoryProperties"
- value="PrintParameters=true, PrettyPrint=true, PrettyPrintLineLength=80"/>-->
+ <entry key="openjpa.ConnectionFactoryProperties"
+ value="PrintParameters=true, PrettyPrint=true, PrettyPrintLineLength=80"/>-->
<entry key="openjpa.NontransactionalWrite" value="false"/>
<entry key="openjpa.AutoDetach" value="close, commit, nontx-read, rollback"/>
@@ -46,7 +46,7 @@ under the License.
<entry key="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
<entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/>
- <entry key="openjpa.DataCache" value="true" />
+ <entry key="openjpa.DataCache" value="true"/>
<entry key="openjpa.QueryCache" value="true"/>
<entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
</map>
Modified: syncope/trunk/core/src/main/resources/restContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/restContext.xml (original)
+++ syncope/trunk/core/src/main/resources/restContext.xml Mon Jan 21 11:28:00 2013
@@ -16,133 +16,133 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:oxm="http://www.springframework.org/schema/oxm"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxrs
- http://cxf.apache.org/schemas/jaxrs.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/oxm
- http://www.springframework.org/schema/oxm/spring-oxm.xsd"
->
-
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <context:component-scan base-package="org.apache.syncope.core.rest.controller" />
-
- <bean id="adminUser" class="java.lang.String">
- <constructor-arg value="${adminUser}" />
- </bean>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:oxm="http://www.springframework.org/schema/oxm"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxrs
+ http://cxf.apache.org/schemas/jaxrs.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/oxm
+ http://www.springframework.org/schema/oxm/spring-oxm.xsd">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+
+ <context:component-scan base-package="org.apache.syncope.core.rest.controller"/>
+
+ <bean id="adminUser" class="java.lang.String">
+ <constructor-arg value="${adminUser}"/>
+ </bean>
- <!-- CXF Configuration - BEGINN -->
- <context:component-scan base-package="org.apache.syncope.core.services.impl" />
+ <!-- CXF Configuration - BEGIN -->
+ <context:component-scan base-package="org.apache.syncope.core.services.impl"/>
- <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
- <property name="depthProperties">
- <bean id="depthProperties" class="org.apache.cxf.staxutils.DocumentDepthProperties">
- <property name="innerElementCountThreshold" value="500" />
- </bean>
- </property>
- <property name="marshallerProperties">
- <map>
- <entry key="jaxb.formatted.output">
- <value type="java.lang.Boolean">true</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider">
- <property name="mapper" ref="jacksonObjectMapper" />
- </bean>
-
- <bean id="exceptionMapper" class="org.apache.syncope.core.rest.RestServiceExceptionMapper" />
-
- <jaxrs:server id="restContainer" address="/">
- <jaxrs:serviceBeans>
- <ref bean="configurationServiceImpl" />
- <ref bean="connectorServiceImpl" />
- <ref bean="entitlementServiceImpl" />
- </jaxrs:serviceBeans>
- <jaxrs:resourceComparator>
- <bean id="myServiceComparator" class="org.apache.syncope.core.rest.QueryResourceInfoComperator" />
- </jaxrs:resourceComparator>
- <jaxrs:providers>
- <ref bean="jaxbProvider" />
- <ref bean="jsonProvider" />
- <ref bean="exceptionMapper" />
- </jaxrs:providers>
- <jaxrs:extensionMappings>
- <entry key="json" value="application/json;charset=UTF-8" />
- <entry key="xml" value="application/xml;charset=UTF-8" />
- </jaxrs:extensionMappings>
- </jaxrs:server>
- <!-- CXF Configuration - END -->
-
- <!-- JSON (via Jackson) -->
- <bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.data.UnwrappedObjectMapper" />
- <bean id="mappingJacksonHttpMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
- <property name="objectMapper" ref="jacksonObjectMapper" />
- </bean>
-
- <!-- XML (via XStream) -->
- <bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
- <property name="autodetectAnnotations" value="true" />
- </bean>
- <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
- <constructor-arg ref="xStreamXmlMarshaller" />
- </bean>
-
- <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" />
- <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
- <property name="messageConverters">
- <list>
- <ref bean="mappingJacksonHttpMessageConverter" />
- <ref bean="mappingXstreamHttpMessageConverter" />
- </list>
- </property>
- </bean>
-
- <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
- <property name="mediaTypes">
- <map>
- <entry key="json" value="application/json;charset=UTF-8" />
- <entry key="xml" value="application/xml;charset=UTF-8" />
- <entry key="html" value="text/html;charset=UTF-8" />
- </map>
- </property>
- <property name="viewResolvers">
- <list>
- <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
- <property name="prefix" value="/" />
- <property name="suffix" value=".jsp" />
- </bean>
- </list>
- </property>
- <property name="defaultViews">
- <list>
- <bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
- <property name="objectMapper" ref="jacksonObjectMapper" />
- </bean>
- <bean class="org.springframework.web.servlet.view.xml.MarshallingView">
- <constructor-arg ref="xStreamXmlMarshaller" />
- </bean>
- </list>
- </property>
- <property name="defaultContentType">
- <bean id="jsonMediaType" class="org.springframework.http.MediaType">
- <constructor-arg value="application" />
- <constructor-arg value="json" />
- <constructor-arg value="UTF-8" />
- </bean>
- </property>
+ <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
+ <property name="depthProperties">
+ <bean id="depthProperties" class="org.apache.cxf.staxutils.DocumentDepthProperties">
+ <property name="innerElementCountThreshold" value="500"/>
+ </bean>
+ </property>
+ <property name="marshallerProperties">
+ <map>
+ <entry key="jaxb.formatted.output">
+ <value type="java.lang.Boolean">true</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider">
+ <property name="mapper" ref="jacksonObjectMapper"/>
+ </bean>
+
+ <bean id="exceptionMapper" class="org.apache.syncope.core.rest.RestServiceExceptionMapper"/>
+
+ <jaxrs:server id="restContainer" address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="configurationServiceImpl"/>
+ <ref bean="connectorServiceImpl"/>
+ <ref bean="entitlementServiceImpl"/>
+ </jaxrs:serviceBeans>
+ <jaxrs:resourceComparator>
+ <bean id="myServiceComparator" class="org.apache.syncope.core.rest.QueryResourceInfoComperator"/>
+ </jaxrs:resourceComparator>
+ <jaxrs:providers>
+ <ref bean="jaxbProvider"/>
+ <ref bean="jsonProvider"/>
+ <ref bean="exceptionMapper"/>
+ </jaxrs:providers>
+ <jaxrs:extensionMappings>
+ <entry key="json" value="application/json;charset=UTF-8"/>
+ <entry key="xml" value="application/xml;charset=UTF-8"/>
+ </jaxrs:extensionMappings>
+ </jaxrs:server>
+ <!-- CXF Configuration - END -->
+
+ <!-- JSON (via Jackson) -->
+ <bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.data.UnwrappedObjectMapper"/>
+ <bean id="mappingJacksonHttpMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+ <property name="objectMapper" ref="jacksonObjectMapper"/>
+ </bean>
+
+ <!-- XML (via XStream) -->
+ <bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
+ <property name="autodetectAnnotations" value="true"/>
+ </bean>
+ <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
+ <constructor-arg ref="xStreamXmlMarshaller"/>
+ </bean>
+
+ <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
+ <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+ <property name="messageConverters">
+ <list>
+ <ref bean="mappingJacksonHttpMessageConverter"/>
+ <ref bean="mappingXstreamHttpMessageConverter"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+ <property name="mediaTypes">
+ <map>
+ <entry key="json" value="application/json;charset=UTF-8"/>
+ <entry key="xml" value="application/xml;charset=UTF-8"/>
+ <entry key="html" value="text/html;charset=UTF-8"/>
+ </map>
+ </property>
+ <property name="viewResolvers">
+ <list>
+ <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+ <property name="prefix" value="/"/>
+ <property name="suffix" value=".jsp"/>
+ </bean>
+ </list>
+ </property>
+ <property name="defaultViews">
+ <list>
+ <bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
+ <property name="objectMapper" ref="jacksonObjectMapper"/>
+ </bean>
+ <bean class="org.springframework.web.servlet.view.xml.MarshallingView">
+ <constructor-arg ref="xStreamXmlMarshaller"/>
+ </bean>
+ </list>
+ </property>
+ <property name="defaultContentType">
+ <bean id="jsonMediaType" class="org.springframework.http.MediaType">
+ <constructor-arg value="application"/>
+ <constructor-arg value="json"/>
+ <constructor-arg value="UTF-8"/>
+ </bean>
+ </property>
- <property name="ignoreAcceptHeader" value="false" />
- </bean>
+ <property name="ignoreAcceptHeader" value="false"/>
+ </bean>
</beans>
Modified: syncope/trunk/core/src/main/resources/schedulingContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/schedulingContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/schedulingContext.xml (original)
+++ syncope/trunk/core/src/main/resources/schedulingContext.xml Mon Jan 21 11:28:00 2013
@@ -16,39 +16,37 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd"
->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
- lazy-init="false" depends-on="nonJPAdbInitializer"
- >
- <property name="autoStartup" value="true" />
- <property name="applicationContextSchedulerContextKey" value="applicationContext" />
- <property name="waitForJobsToCompleteOnShutdown" value="true" />
- <property name="overwriteExistingJobs" value="true" />
- <property name="dataSource" ref="dataSource" />
- <property name="transactionManager" ref="transactionManager" />
- <property name="jobFactory">
- <bean class="org.apache.syncope.core.quartz.SpringBeanJobFactory" />
- </property>
- <property name="quartzProperties">
- <props>
- <prop key="org.quartz.jobStore.misfireThreshold">6000000</prop>
- <prop key="org.quartz.jobStore.driverDelegateClass">${quartz.jobstore}</prop>
+ <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
+ lazy-init="false" depends-on="nonJPAdbInitializer">
+ <property name="autoStartup" value="true"/>
+ <property name="applicationContextSchedulerContextKey" value="applicationContext"/>
+ <property name="waitForJobsToCompleteOnShutdown" value="true"/>
+ <property name="overwriteExistingJobs" value="true"/>
+ <property name="dataSource" ref="dataSource"/>
+ <property name="transactionManager" ref="transactionManager"/>
+ <property name="jobFactory">
+ <bean class="org.apache.syncope.core.quartz.SpringBeanJobFactory"/>
+ </property>
+ <property name="quartzProperties">
+ <props>
+ <prop key="org.quartz.jobStore.misfireThreshold">6000000</prop>
+ <prop key="org.quartz.jobStore.driverDelegateClass">${quartz.jobstore}</prop>
- <prop key="org.quartz.jobStore.isClustered">true</prop>
- <prop key="org.quartz.jobStore.clusterCheckinInterval">20000</prop>
+ <prop key="org.quartz.jobStore.isClustered">true</prop>
+ <prop key="org.quartz.jobStore.clusterCheckinInterval">20000</prop>
- <prop key="org.quartz.scheduler.instanceName">ClusteredScheduler</prop>
- <prop key="org.quartz.scheduler.instanceId">AUTO</prop>
- <prop key="org.quartz.scheduler.jmx.export">true</prop>
- </props>
- </property>
- </bean>
+ <prop key="org.quartz.scheduler.instanceName">ClusteredScheduler</prop>
+ <prop key="org.quartz.scheduler.instanceId">AUTO</prop>
+ <prop key="org.quartz.scheduler.jmx.export">true</prop>
+ </props>
+ </property>
+ </bean>
- <bean id="notificationJob" class="org.apache.syncope.core.notification.NotificationJob" />
+ <bean id="notificationJob" class="org.apache.syncope.core.notification.NotificationJob"/>
</beans>
Modified: syncope/trunk/core/src/main/resources/securityContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/securityContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/securityContext.xml (original)
+++ syncope/trunk/core/src/main/resources/securityContext.xml Mon Jan 21 11:28:00 2013
@@ -16,15 +16,14 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/security
+ http://www.springframework.org/schema/security/spring-security.xsd">
<security:global-method-security pre-post-annotations="enabled"/>
Modified: syncope/trunk/core/src/main/resources/syncopeContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/syncopeContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/syncopeContext.xml (original)
+++ syncope/trunk/core/src/main/resources/syncopeContext.xml Mon Jan 21 11:28:00 2013
@@ -17,67 +17,67 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd"
->
+ http://www.springframework.org/schema/context/spring-context.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value>classpath:persistence.properties</value>
- <value>classpath:security.properties</value>
- <value>classpath:workflow.properties</value>
- </list>
- </property>
- <property name="ignoreResourceNotFound" value="true" />
- <property name="ignoreUnresolvablePlaceholders" value="true" />
- </bean>
-
- <bean class="org.apache.syncope.core.util.ApplicationContextProvider" />
-
- <context:component-scan base-package="org.apache.syncope.core.init" />
- <context:component-scan base-package="org.apache.syncope.core.audit" />
- <context:component-scan base-package="org.apache.syncope.core.connid" />
- <context:component-scan base-package="org.apache.syncope.core.rest.data" />
- <context:component-scan base-package="org.apache.syncope.core.workflow" />
-
- <bean id="nonJPAdbInitializer" class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
- <property name="dataSource" ref="dataSource" />
- <property name="enabled" value="true" />
- <property name="databasePopulator">
- <bean class="org.springframework.jdbc.datasource.init.ResourceDatabasePopulator">
- <property name="continueOnError" value="true" />
- <property name="ignoreFailedDrops" value="true" />
- <property name="sqlScriptEncoding" value="UTF-8" />
- <property name="scripts">
- <array>
- <value type="org.springframework.core.io.Resource">
- classpath:/quartz/${quartz.sql}
- </value>
- <value type="org.springframework.core.io.Resource">
- classpath:/logback/${logback.sql}
- </value>
- </array>
- </property>
- </bean>
- </property>
- </bean>
-
- <bean id="propagationManager" class="org.apache.syncope.core.propagation.impl.PropagationManager" />
- <bean id="propagationTaskExecutor" class="org.apache.syncope.core.propagation.impl.PriorityPropagationTaskExecutor" />
-
- <bean id="notificationManager" class="org.apache.syncope.core.notification.NotificationManager" />
-
- <bean id="auditManager" class="org.apache.syncope.core.audit.AuditManager" />
-
- <bean id="jexlEngine" class="org.apache.commons.jexl2.JexlEngine">
- <property name="cache" value="512" />
- <property name="lenient" value="true" />
- <property name="silent" value="false" />
- </bean>
- <bean id="jexlUtil" class="org.apache.syncope.core.util.JexlUtil" />
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <list>
+ <value>classpath:persistence.properties</value>
+ <value>classpath:security.properties</value>
+ <value>classpath:workflow.properties</value>
+ </list>
+ </property>
+ <property name="ignoreResourceNotFound" value="true"/>
+ <property name="ignoreUnresolvablePlaceholders" value="true"/>
+ </bean>
+
+ <bean class="org.apache.syncope.core.util.ApplicationContextProvider"/>
+
+ <context:component-scan base-package="org.apache.syncope.core.init"/>
+ <context:component-scan base-package="org.apache.syncope.core.audit"/>
+ <context:component-scan base-package="org.apache.syncope.core.connid"/>
+ <context:component-scan base-package="org.apache.syncope.core.rest.data"/>
+ <context:component-scan base-package="org.apache.syncope.core.workflow"/>
+
+ <bean id="nonJPAdbInitializer" class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
+ <property name="dataSource" ref="dataSource"/>
+ <property name="enabled" value="true"/>
+ <property name="databasePopulator">
+ <bean class="org.springframework.jdbc.datasource.init.ResourceDatabasePopulator">
+ <property name="continueOnError" value="true"/>
+ <property name="ignoreFailedDrops" value="true"/>
+ <property name="sqlScriptEncoding" value="UTF-8"/>
+ <property name="scripts">
+ <array>
+ <value type="org.springframework.core.io.Resource">
+ classpath:/quartz/${quartz.sql}
+ </value>
+ <value type="org.springframework.core.io.Resource">
+ classpath:/logback/${logback.sql}
+ </value>
+ </array>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <bean id="propagationManager" class="org.apache.syncope.core.propagation.impl.PropagationManager"/>
+ <bean id="propagationTaskExecutor" class="org.apache.syncope.core.propagation.impl.PriorityPropagationTaskExecutor"/>
+
+ <bean id="notificationManager" class="org.apache.syncope.core.notification.NotificationManager"/>
+
+ <bean id="auditManager" class="org.apache.syncope.core.audit.AuditManager"/>
+
+ <bean id="jexlEngine" class="org.apache.commons.jexl2.JexlEngine">
+ <property name="cache" value="512"/>
+ <property name="lenient" value="true"/>
+ <property name="silent" value="false"/>
+ </bean>
+ <bean id="jexlUtil" class="org.apache.syncope.core.util.JexlUtil"/>
</beans>
Modified: syncope/trunk/core/src/main/resources/workflowContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/workflowContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/workflowContext.xml (original)
+++ syncope/trunk/core/src/main/resources/workflowContext.xml Mon Jan 21 11:28:00 2013
@@ -16,70 +16,69 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd"
->
-
- <bean id="adminUser" class="java.lang.String">
- <constructor-arg value="${adminUser}" />
- </bean>
-
- <bean id="uwfAdapter" class="${uwfAdapter}" />
- <bean id="rwfAdapter" class="${rwfAdapter}" />
-
- <bean id="syncopeActivitiUserManager" class="org.apache.syncope.core.workflow.user.activiti.SyncopeUserManager" />
- <bean id="syncopeActivitiGroupManager" class="org.apache.syncope.core.workflow.user.activiti.SyncopeGroupManager" />
-
- <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
- <property name="dataSource" ref="dataSource" />
- <property name="transactionManager" ref="transactionManager" />
- <property name="transactionsExternallyManaged" value="true" />
- <property name="databaseSchemaUpdate" value="true" />
-
- <property name="jpaEntityManagerFactory" ref="entityManagerFactory" />
- <property name="jpaHandleTransaction" value="true" />
- <property name="jpaCloseEntityManager" value="false" />
-
- <property name="jobExecutorActivate" value="${jobExecutorActivate}" />
-
- <property name="customSessionFactories">
- <list>
- <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeSessionFactory">
- <property name="syncopeSession" ref="syncopeActivitiUserManager" />
- </bean>
- <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeSessionFactory">
- <property name="syncopeSession" ref="syncopeActivitiGroupManager" />
- </bean>
- </list>
- </property>
- <property name="customPreVariableTypes">
- <list>
- <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeEntitiesVariableType" />
- </list>
- </property>
- </bean>
-
- <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
- <property name="processEngineConfiguration" ref="processEngineConfiguration" />
- </bean>
-
- <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
- <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
- <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />
- <bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService" />
- <bean id="managementService" factory-bean="processEngine" factory-method="getManagementService" />
- <bean id="identityService" factory-bean="processEngine" factory-method="getIdentityService" />
- <bean id="formService" factory-bean="processEngine" factory-method="getFormService" />
-
- <bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <value>
- resource.loader=class
- class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </value>
- </property>
- </bean>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="adminUser" class="java.lang.String">
+ <constructor-arg value="${adminUser}"/>
+ </bean>
+
+ <bean id="uwfAdapter" class="${uwfAdapter}"/>
+ <bean id="rwfAdapter" class="${rwfAdapter}"/>
+
+ <bean id="syncopeActivitiUserManager" class="org.apache.syncope.core.workflow.user.activiti.SyncopeUserManager"/>
+ <bean id="syncopeActivitiGroupManager" class="org.apache.syncope.core.workflow.user.activiti.SyncopeGroupManager"/>
+
+ <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
+ <property name="dataSource" ref="dataSource"/>
+ <property name="transactionManager" ref="transactionManager"/>
+ <property name="transactionsExternallyManaged" value="true"/>
+ <property name="databaseSchemaUpdate" value="true"/>
+
+ <property name="jpaEntityManagerFactory" ref="entityManagerFactory"/>
+ <property name="jpaHandleTransaction" value="true"/>
+ <property name="jpaCloseEntityManager" value="false"/>
+
+ <property name="jobExecutorActivate" value="${jobExecutorActivate}"/>
+
+ <property name="customSessionFactories">
+ <list>
+ <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeSessionFactory">
+ <property name="syncopeSession" ref="syncopeActivitiUserManager"/>
+ </bean>
+ <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeSessionFactory">
+ <property name="syncopeSession" ref="syncopeActivitiGroupManager"/>
+ </bean>
+ </list>
+ </property>
+ <property name="customPreVariableTypes">
+ <list>
+ <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeEntitiesVariableType"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+ <property name="processEngineConfiguration" ref="processEngineConfiguration"/>
+ </bean>
+
+ <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService"/>
+ <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService"/>
+ <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService"/>
+ <bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService"/>
+ <bean id="managementService" factory-bean="processEngine" factory-method="getManagementService"/>
+ <bean id="identityService" factory-bean="processEngine" factory-method="getIdentityService"/>
+ <bean id="formService" factory-bean="processEngine" factory-method="getFormService"/>
+
+ <bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <value>
+ resource.loader=class
+ class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </value>
+ </property>
+ </bean>
</beans>
Modified: syncope/trunk/core/src/test/resources/content.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Mon Jan 21 11:28:00 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<dataset>
<SyncopeConf confKey="connid.bundles.directory" confValue="${bundles.directory}"/>
Modified: syncope/trunk/core/src/test/resources/context.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/context.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/context.xml (original)
+++ syncope/trunk/core/src/test/resources/context.xml Mon Jan 21 11:28:00 2013
@@ -16,10 +16,9 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<Context>
- <!-- Disable session persistence across Tomcat restarts -->
+ <!-- Disable session persistence across Tomcat restarts -->
<Manager pathname="" />
<Loader className="org.apache.catalina.loader.VirtualWebappLoader"
Modified: syncope/trunk/core/src/test/resources/persistenceTestEnv.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/persistenceTestEnv.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/persistenceTestEnv.xml (original)
+++ syncope/trunk/core/src/test/resources/persistenceTestEnv.xml Mon Jan 21 11:28:00 2013
@@ -1,28 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-
+<!--
+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.
+-->
<!-- This should not end in *Context as it would then be picked up in the cargo start -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop.xsd">
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop.xsd">
<bean class="org.apache.syncope.core.persistence.dao.impl.TestDbInitializer"/>
<bean class="org.apache.syncope.core.persistence.dao.DummyConnectorRegistry">
@@ -38,20 +46,20 @@
<value>classpath:workflow.properties</value>
</list>
</property>
- <property name="ignoreResourceNotFound" value="true" />
- <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="ignoreResourceNotFound" value="true"/>
+ <property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
<bean id="nonJPAdbInitializer"
- class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
- <property name="dataSource" ref="dataSource" />
- <property name="enabled" value="true" />
+ class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
+ <property name="dataSource" ref="dataSource"/>
+ <property name="enabled" value="true"/>
<property name="databasePopulator">
<bean
class="org.springframework.jdbc.datasource.init.ResourceDatabasePopulator">
- <property name="continueOnError" value="true" />
- <property name="ignoreFailedDrops" value="true" />
- <property name="sqlScriptEncoding" value="UTF-8" />
+ <property name="continueOnError" value="true"/>
+ <property name="ignoreFailedDrops" value="true"/>
+ <property name="sqlScriptEncoding" value="UTF-8"/>
<property name="scripts">
<array>
<value type="org.springframework.core.io.Resource">
@@ -67,11 +75,11 @@
</bean>
<bean id="jexlEngine" class="org.apache.commons.jexl2.JexlEngine">
- <property name="cache" value="512" />
- <property name="lenient" value="true" />
- <property name="silent" value="false" />
+ <property name="cache" value="512"/>
+ <property name="lenient" value="true"/>
+ <property name="silent" value="false"/>
</bean>
- <bean id="jexlUtil" class="org.apache.syncope.core.util.JexlUtil" />
+ <bean id="jexlUtil" class="org.apache.syncope.core.util.JexlUtil"/>
- <import resource="persistenceContext.xml" />
+ <import resource="persistenceContext.xml"/>
</beans>
Modified: syncope/trunk/core/src/test/resources/restClientContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/restClientContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/restClientContext.xml (original)
+++ syncope/trunk/core/src/test/resources/restClientContext.xml Mon Jan 21 11:28:00 2013
@@ -16,63 +16,62 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd"
->
-
- <bean id="httpClientConnManager" class="org.apache.http.impl.conn.PoolingClientConnectionManager" />
-
- <bean id="httpClientParams" class="org.apache.syncope.client.http.HttpClientParams">
- <property name="parameterMap">
- <map key-type="java.lang.String">
- <entry>
- <key>
- <value>http.protocol.handle-authentication</value>
- </key>
- <value type="java.lang.Boolean">
- false
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="httpClientFactory" class="org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory">
- <constructor-arg value="localhost" />
- <constructor-arg value="9080" />
- <constructor-arg value="http" />
- <constructor-arg ref="httpClientConnManager" />
- <constructor-arg ref="httpClientParams" />
- </bean>
-
- <bean id="restTemplate" class="org.springframework.web.client.RestTemplate">
- <constructor-arg ref="httpClientFactory" />
- <property name="messageConverters">
- <list>
- <ref bean="mappingJacksonHttpMessageConverter" />
- <ref bean="mappingXstreamHttpMessageConverter" />
- </list>
- </property>
- <property name="errorHandler">
- <bean id="syncopeClientErrorHandler" class="org.apache.syncope.common.validation.SyncopeClientErrorHandler" />
- </property>
- </bean>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="httpClientConnManager" class="org.apache.http.impl.conn.PoolingClientConnectionManager"/>
+
+ <bean id="httpClientParams" class="org.apache.syncope.client.http.HttpClientParams">
+ <property name="parameterMap">
+ <map key-type="java.lang.String">
+ <entry>
+ <key>
+ <value>http.protocol.handle-authentication</value>
+ </key>
+ <value type="java.lang.Boolean">
+ false
+ </value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="httpClientFactory" class="org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory">
+ <constructor-arg value="localhost"/>
+ <constructor-arg value="9080"/>
+ <constructor-arg value="http"/>
+ <constructor-arg ref="httpClientConnManager"/>
+ <constructor-arg ref="httpClientParams"/>
+ </bean>
+
+ <bean id="restTemplate" class="org.springframework.web.client.RestTemplate">
+ <constructor-arg ref="httpClientFactory"/>
+ <property name="messageConverters">
+ <list>
+ <ref bean="mappingJacksonHttpMessageConverter"/>
+ <ref bean="mappingXstreamHttpMessageConverter"/>
+ </list>
+ </property>
+ <property name="errorHandler">
+ <bean id="syncopeClientErrorHandler" class="org.apache.syncope.common.validation.SyncopeClientErrorHandler"/>
+ </property>
+ </bean>
- <!-- JSON (via Jackson) -->
- <bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.data.UnwrappedObjectMapper" />
- <bean id="mappingJacksonHttpMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
- <property name="objectMapper" ref="jacksonObjectMapper" />
- </bean>
+ <!-- JSON (via Jackson) -->
+ <bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.data.UnwrappedObjectMapper"/>
+ <bean id="mappingJacksonHttpMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+ <property name="objectMapper" ref="jacksonObjectMapper"/>
+ </bean>
- <!-- XML (via XStream) -->
- <bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
- <property name="autodetectAnnotations" value="true" />
- </bean>
- <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
- <constructor-arg ref="xStreamXmlMarshaller" />
- </bean>
+ <!-- XML (via XStream) -->
+ <bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
+ <property name="autodetectAnnotations" value="true"/>
+ </bean>
+ <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
+ <constructor-arg ref="xStreamXmlMarshaller"/>
+ </bean>
</beans>
Modified: syncope/trunk/core/src/test/resources/testJDBCContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/testJDBCContext.xml?rev=1436279&r1=1436278&r2=1436279&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/testJDBCContext.xml (original)
+++ syncope/trunk/core/src/test/resources/testJDBCContext.xml Mon Jan 21 11:28:00 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -31,4 +30,4 @@ under the License.
<property name="password" value="${testdb.password}"/>
</bean>
-</beans>
\ No newline at end of file
+</beans>