Hi Francesco, Is it really necessary to merge this change to the CXF branch? IMO it's probably best to keep the branch "clean" from when it was forked, so that it's easier to merge back to trunk when the task is complete.
Colm. On Wed, Nov 14, 2012 at 8:50 AM, <[email protected]> wrote: > Author: ilgrosso > Date: Wed Nov 14 08:50:48 2012 > New Revision: 1409117 > > URL: http://svn.apache.org/viewvc?rev=1409117&view=rev > Log: > Merge from trunk > > Modified: > incubator/syncope/branches/cxf/ (props changed) > > incubator/syncope/branches/cxf/archetype/src/main/resources/archetype-resources/core/pom.xml > incubator/syncope/branches/cxf/console/pom.xml > > incubator/syncope/branches/cxf/console/src/main/resources/applicationContext.xml > incubator/syncope/branches/cxf/core/pom.xml > > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java > > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java > > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java > > incubator/syncope/branches/cxf/core/src/main/resources/persistenceContext.xml > > incubator/syncope/branches/cxf/core/src/main/resources/userWorkflow.bpmn20.xml > incubator/syncope/branches/cxf/pom.xml > > Propchange: incubator/syncope/branches/cxf/ > > ------------------------------------------------------------------------------ > Merged /incubator/syncope/branches/1_0_X:r1405276-1408021 > Merged /incubator/syncope/trunk:r1405780-1409115 > > Modified: > incubator/syncope/branches/cxf/archetype/src/main/resources/archetype-resources/core/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/archetype/src/main/resources/archetype-resources/core/pom.xml > (original) > +++ > incubator/syncope/branches/cxf/archetype/src/main/resources/archetype-resources/core/pom.xml > Wed Nov 14 08:50:48 2012 > @@ -72,33 +72,6 @@ under the License. > <artifactId>spring-security-config</artifactId> > </dependency> > > - <dependency> > - <groupId>org.apache.geronimo.specs</groupId> > - <artifactId>geronimo-jpa_2.0_spec</artifactId> > - </dependency> > - <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-jdbc</artifactId> > - </dependency> > - <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-persistence-jdbc</artifactId> > - </dependency> > - > - <dependency> > - <groupId>javax.validation</groupId> > - <artifactId>validation-api</artifactId> > - </dependency> > - <dependency> > - <groupId>org.apache.bval</groupId> > - <artifactId>bval-jsr303</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - </dependency> > - > <!-- TEST --> > <dependency> > <groupId>org.apache.syncope</groupId> > > Modified: incubator/syncope/branches/cxf/console/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/console/pom.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- incubator/syncope/branches/cxf/console/pom.xml (original) > +++ incubator/syncope/branches/cxf/console/pom.xml Wed Nov 14 08:50:48 2012 > @@ -51,18 +51,6 @@ under the License. > <version>${project.version}</version> > </dependency> > > - <!-- Only needed for running core --> > - <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - <scope>provided</scope> > - </dependency> > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - <scope>provided</scope> > - </dependency> > - > <dependency> > <groupId>javax.servlet</groupId> > <artifactId>servlet-api</artifactId> > @@ -287,16 +275,6 @@ under the License. > <groupId>com.h2database</groupId> > <artifactId>h2</artifactId> > </dependency> > - > - <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - </dependency> > </dependencies> > </container> > <configuration> > > Modified: > incubator/syncope/branches/cxf/console/src/main/resources/applicationContext.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/console/src/main/resources/applicationContext.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/console/src/main/resources/applicationContext.xml > (original) > +++ > incubator/syncope/branches/cxf/console/src/main/resources/applicationContext.xml > Wed Nov 14 08:50:48 2012 > @@ -77,9 +77,13 @@ under the License. > <key> > <value>http.protocol.handle-authentication</value> > </key> > - <value type="java.lang.Boolean"> > - false > - </value> > + <value type="java.lang.Boolean">false</value> > + </entry> > + <entry> > + <key> > + <value>http.auth.credential-charset</value> > + </key> > + <value type="java.lang.String">false</value> > </entry> > </map> > </property> > > Modified: incubator/syncope/branches/cxf/core/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/pom.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- incubator/syncope/branches/cxf/core/pom.xml (original) > +++ incubator/syncope/branches/cxf/core/pom.xml Wed Nov 14 08:50:48 2012 > @@ -208,40 +208,33 @@ under the License. > > <dependency> > <groupId>org.apache.geronimo.specs</groupId> > - <artifactId>geronimo-jpa_2.0_spec</artifactId> > - <scope>provided</scope> > + <artifactId>geronimo-jpa_2.0_spec</artifactId> > </dependency> > <dependency> > <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - <scope>provided</scope> > + <artifactId>openjpa</artifactId> > </dependency> > <dependency> > <groupId>org.apache.openjpa</groupId> > <artifactId>openjpa-jdbc</artifactId> > - <scope>provided</scope> > </dependency> > <dependency> > <groupId>org.apache.openjpa</groupId> > <artifactId>openjpa-persistence-jdbc</artifactId> > - <scope>provided</scope> > </dependency> > > <dependency> > <groupId>javax.validation</groupId> > <artifactId>validation-api</artifactId> > - <scope>provided</scope> > </dependency> > <dependency> > <groupId>org.apache.bval</groupId> > <artifactId>bval-jsr303</artifactId> > - <scope>provided</scope> > </dependency> > > <dependency> > <groupId>org.codehaus.groovy</groupId> > <artifactId>groovy-all</artifactId> > - <scope>provided</scope> > </dependency> > > <dependency> > @@ -259,7 +252,6 @@ under the License. > <dependency> > <groupId>commons-logging</groupId> > <artifactId>commons-logging</artifactId> > - <scope>provided</scope> > </dependency> > <dependency> > <groupId>org.slf4j</groupId> > @@ -498,16 +490,6 @@ under the License. > <groupId>${jdbcdriver.groupId}</groupId> > <artifactId>${jdbcdriver.artifactId}</artifactId> > </dependency> > - > - <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - </dependency> > </dependencies> > </container> > <configuration> > @@ -1037,16 +1019,6 @@ under the License. > > <dependencies> > <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - </dependency> > - > - <dependency> > <groupId>com.h2database</groupId> > <artifactId>h2</artifactId> > </dependency> > @@ -1091,16 +1063,6 @@ under the License. > > <dependencies> > <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - </dependency> > - > - <dependency> > <groupId>com.h2database</groupId> > <artifactId>h2</artifactId> > </dependency> > @@ -1180,16 +1142,6 @@ under the License. > > <dependencies> > <dependency> > - <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.codehaus.groovy</groupId> > - <artifactId>groovy-all</artifactId> > - </dependency> > - > - <dependency> > <groupId>com.h2database</groupId> > <artifactId>h2</artifactId> > </dependency> > > Modified: > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java > (original) > +++ > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java > Wed Nov 14 08:50:48 2012 > @@ -213,7 +213,7 @@ public class JobInstanceLoader { > unregisterJob(getJobName(report)); > } > > - @Transactional > + @Transactional(readOnly = true) > public void load() { > // 1. jobs for SchedTasks > Set<SchedTask> tasks = new > HashSet(taskDAO.findAll(SchedTask.class)); > > Modified: > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java > (original) > +++ > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java > Wed Nov 14 08:50:48 2012 > @@ -22,7 +22,6 @@ import ch.qos.logback.classic.Logger; > import ch.qos.logback.classic.LoggerContext; > import java.util.HashMap; > import java.util.Map; > -import org.slf4j.LoggerFactory; > import org.springframework.beans.factory.annotation.Autowired; > import org.springframework.stereotype.Component; > import org.springframework.transaction.annotation.Transactional; > @@ -30,6 +29,8 @@ import org.apache.syncope.core.persisten > import org.apache.syncope.core.persistence.dao.LoggerDAO; > import org.apache.syncope.types.SyncopeLoggerLevel; > import org.apache.syncope.types.SyncopeLoggerType; > +import org.slf4j.ILoggerFactory; > +import org.slf4j.LoggerFactory; > > @Component > public class LoggerLoader { > @@ -48,7 +49,9 @@ public class LoggerLoader { > loggerLogs.put(syncopeLogger.getName(), syncopeLogger); > } > > - LoggerContext lc = (LoggerContext) > LoggerFactory.getILoggerFactory(); > + ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); > + > + LoggerContext lc = (LoggerContext) loggerFactory; > > /* > * Traverse all defined Logback loggers: if there is a matching > SyncopeLogger, set Logback level accordingly, > > Modified: > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java > (original) > +++ > incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java > Wed Nov 14 08:50:48 2012 > @@ -234,17 +234,17 @@ public class ConnObjectUtil { > // 2. add data from defined template (if any) > UserTO template = syncTask.getUserTemplate(); > if (template != null) { > - if (StringUtils.isBlank(userTO.getUsername()) && > StringUtils.isNotBlank(template.getUsername())) { > + if (StringUtils.isNotBlank(template.getUsername())) { > String evaluated = > jexlUtil.evaluate(template.getUsername(), userTO); > if (StringUtils.isNotBlank(evaluated)) { > - userTO.setUsername(template.getUsername()); > + userTO.setUsername(evaluated); > } > } > > - if (StringUtils.isBlank(userTO.getPassword()) && > StringUtils.isNotBlank(template.getPassword())) { > + if (StringUtils.isNotBlank(template.getPassword())) { > String evaluated = > jexlUtil.evaluate(template.getPassword(), userTO); > if (StringUtils.isNotBlank(evaluated)) { > - userTO.setPassword(template.getPassword()); > + userTO.setPassword(evaluated); > } > } > > > Modified: > incubator/syncope/branches/cxf/core/src/main/resources/persistenceContext.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/resources/persistenceContext.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/core/src/main/resources/persistenceContext.xml > (original) > +++ > incubator/syncope/branches/cxf/core/src/main/resources/persistenceContext.xml > Wed Nov 14 08:50:48 2012 > @@ -44,24 +44,25 @@ under the License. > <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.jdbc.datasource.IsolationLevelDataSourceAdapter"> > + 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.jndi.JndiObjectFactoryBean"> > - <property name="jndiName" > value="java:comp/env/jdbc/syncopeDataSource"/> > - <property name="defaultObject" ref="localDataSource"/> > + <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="localDataSource" > 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> > - > + > <bean id="entityManager" > class="org.springframework.orm.jpa.support.SharedEntityManagerBean"> > <property name="entityManagerFactory" ref="entityManagerFactory"/> > </bean> > > Modified: > incubator/syncope/branches/cxf/core/src/main/resources/userWorkflow.bpmn20.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/resources/userWorkflow.bpmn20.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- > incubator/syncope/branches/cxf/core/src/main/resources/userWorkflow.bpmn20.xml > (original) > +++ > incubator/syncope/branches/cxf/core/src/main/resources/userWorkflow.bpmn20.xml > Wed Nov 14 08:50:48 2012 > @@ -23,12 +23,12 @@ under the License. > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > xmlns:activiti="http://activiti.org/bpmn"; > xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"; > - xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"; > + xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"; > xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"; > xsi:schemaLocation=" > http://www.omg.org/spec/BPMN/20100524/MODEL > > http://www.omg.org/spec/BPMN/2.0/20100501/BPMN20.xsd";> > > - <process id="userWorkflow" name="User Workflow"> > + <process id="userWorkflow" name="User Workflow" isExecutable="true"> > > <startEvent id="theStart"/> > > > Modified: incubator/syncope/branches/cxf/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/pom.xml?rev=1409117&r1=1409116&r2=1409117&view=diff > > ============================================================================== > --- incubator/syncope/branches/cxf/pom.xml (original) > +++ incubator/syncope/branches/cxf/pom.xml Wed Nov 14 08:50:48 2012 > @@ -214,7 +214,7 @@ under the License. > </roles> > <url>http://people.apache.org/~jbonofre/</url> > </developer> > - <developer> > + <developer> > <id>jbernhardt</id> > <name>Jan Bernhardt</name> > <organization>Talend</organization> > @@ -275,7 +275,7 @@ under the License. > <velocity.version>1.7</velocity.version> > <quartz.version>2.1.6</quartz.version> > > - <openjpa.version>2.2.0</openjpa.version> > + <openjpa.version>2.2.1</openjpa.version> > <bval.version>0.5</bval.version> > > <cocoon.version>3.0.0-alpha-3</cocoon.version> > @@ -416,9 +416,10 @@ under the License. > <artifactId>geronimo-jpa_2.0_spec</artifactId> > <version>1.1</version> > </dependency> > + > <dependency> > <groupId>org.apache.openjpa</groupId> > - <artifactId>openjpa-all</artifactId> > + <artifactId>openjpa</artifactId> > <version>${openjpa.version}</version> > </dependency> > <dependency> > > > -- Colm O hEigeartaigh Talend Community Coder http://coders.talend.com
