Author: ilgrosso
Date: Mon Jan 21 10:31:42 2013
New Revision: 1436262
URL: http://svn.apache.org/viewvc?rev=1436262&view=rev
Log:
Bare XML formatting
Modified:
syncope/trunk/client/pom.xml
syncope/trunk/common/pom.xml
syncope/trunk/console/src/main/resources/applicationContext.xml
Modified: syncope/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/pom.xml?rev=1436262&r1=1436261&r2=1436262&view=diff
==============================================================================
--- syncope/trunk/client/pom.xml (original)
+++ syncope/trunk/client/pom.xml Mon Jan 21 10:31:42 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.
-
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
@@ -43,16 +42,17 @@ under the License.
</distributionManagement>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -87,7 +87,6 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: syncope/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/pom.xml?rev=1436262&r1=1436261&r2=1436262&view=diff
==============================================================================
--- syncope/trunk/common/pom.xml (original)
+++ syncope/trunk/common/pom.xml Mon Jan 21 10:31:42 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.
-
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
@@ -43,10 +42,11 @@ under the License.
</distributionManagement>
<dependencies>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -81,7 +81,6 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: syncope/trunk/console/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/applicationContext.xml?rev=1436262&r1=1436261&r2=1436262&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/applicationContext.xml (original)
+++ syncope/trunk/console/src/main/resources/applicationContext.xml Mon Jan 21
10:31:42 2013
@@ -18,11 +18,14 @@ specific language governing permissions
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:aop="http://www.springframework.org/schema/aop";
xmlns:p="http://www.springframework.org/schema/p";
- xmlns:context="http://www.springframework.org/schema/context";
xmlns:oxm="http://www.springframework.org/schema/oxm";
- xmlns:tx="http://www.springframework.org/schema/tx";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xmlns:p="http://www.springframework.org/schema/p";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:oxm="http://www.springframework.org/schema/oxm";
+ xmlns:tx="http://www.springframework.org/schema/tx";
+ 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
@@ -31,92 +34,91 @@ under the License.
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";
->
+ http://www.springframework.org/schema/aop/spring-aop.xsd";>
- <context:component-scan base-package="org.apache.syncope.console.rest" />
+ <context:component-scan base-package="org.apache.syncope.console.rest"/>
- <bean id="systemPropertyConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="order" value="1" />
- <property name="location"
value="file:#{(systemProperties['syncope.console.configuration'])}" />
- <property name="ignoreResourceNotFound" value="true" />
- <property name="ignoreUnresolvablePlaceholders" value="true" />
- </bean>
- <bean id="defaultPropertyConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value>classpath:configuration.properties</value>
- </list>
- </property>
- </bean>
-
- <bean id="baseURL" class="java.lang.String">
- <constructor-arg value="${scheme}://${host}:${port}${rootPath}" />
- </bean>
-
- <bean id="version" class="java.lang.String">
- <constructor-arg value="${version}" />
- </bean>
-
- <bean id="authorizations" class="java.lang.String">
- <constructor-arg value="authorizations.xml" />
- </bean>
-
- <bean id="syncopeApplication"
class="org.apache.syncope.console.SyncopeApplication" />
-
- <bean id="jacksonObjectMapper"
class="org.codehaus.jackson.map.ObjectMapper" />
-
- <bean id="mappingJacksonHttpMessageConverter"
class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
- <property name="objectMapper" ref="jacksonObjectMapper" />
- </bean>
-
- <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>
- <entry>
- <key>
- <value>http.auth.credential-charset</value>
- </key>
- <value type="java.lang.String">UTF-8</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="httpClientFactory"
class="org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory"
- scope="prototype"
- >
- <constructor-arg value="${host}" />
- <constructor-arg value="${port}" />
- <constructor-arg value="${scheme}" />
- <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" />
- </list>
- </property>
- <property name="errorHandler">
- <bean id="syncopeClientErrorHandler"
class="org.apache.syncope.common.validation.SyncopeClientErrorHandler" />
- </property>
- </bean>
+ <bean id="systemPropertyConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="order" value="1"/>
+ <property name="location"
value="file:#{(systemProperties['syncope.console.configuration'])}"/>
+ <property name="ignoreResourceNotFound" value="true"/>
+ <property name="ignoreUnresolvablePlaceholders" value="true"/>
+ </bean>
+ <bean id="defaultPropertyConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <list>
+ <value>classpath:configuration.properties</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="baseURL" class="java.lang.String">
+ <constructor-arg value="${scheme}://${host}:${port}${rootPath}"/>
+ </bean>
+
+ <bean id="version" class="java.lang.String">
+ <constructor-arg value="${version}"/>
+ </bean>
+
+ <bean id="authorizations" class="java.lang.String">
+ <constructor-arg value="authorizations.xml"/>
+ </bean>
+
+ <bean id="syncopeApplication"
class="org.apache.syncope.console.SyncopeApplication"/>
+
+ <bean id="jacksonObjectMapper"
class="org.codehaus.jackson.map.ObjectMapper"/>
+
+ <bean id="mappingJacksonHttpMessageConverter"
+
class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+ <property name="objectMapper" ref="jacksonObjectMapper"/>
+ </bean>
+
+ <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>
+ <entry>
+ <key>
+ <value>http.auth.credential-charset</value>
+ </key>
+ <value type="java.lang.String">UTF-8</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="httpClientFactory"
class="org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory"
+ scope="prototype">
+ <constructor-arg value="${host}"/>
+ <constructor-arg value="${port}"/>
+ <constructor-arg value="${scheme}"/>
+ <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"/>
+ </list>
+ </property>
+ <property name="errorHandler">
+ <bean id="syncopeClientErrorHandler"
class="org.apache.syncope.common.validation.SyncopeClientErrorHandler"/>
+ </property>
+ </bean>
- <bean id="preferenceManager"
class="org.apache.syncope.console.commons.PreferenceManager" />
+ <bean id="preferenceManager"
class="org.apache.syncope.console.commons.PreferenceManager"/>
- <bean id="xmlRolesReader"
class="org.apache.syncope.console.commons.XMLRolesReader" />
+ <bean id="xmlRolesReader"
class="org.apache.syncope.console.commons.XMLRolesReader"/>
- <bean id="roleTreeBuilder"
class="org.apache.syncope.console.commons.RoleTreeBuilder" />
+ <bean id="roleTreeBuilder"
class="org.apache.syncope.console.commons.RoleTreeBuilder"/>
</beans>
