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 2014/07/30 17:06:38 UTC
svn commit: r1614680 [2/2] - in /syncope/trunk: ./ archetype/
archetype/src/main/resources/archetype-resources/console/
archetype/src/main/resources/archetype-resources/core/ console/
console/src/main/java/org/apache/syncope/console/ console/src/main/r...
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java Wed Jul 30 15:06:37 2014
@@ -80,7 +80,7 @@ import org.springframework.transaction.a
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
- "classpath:syncopeContext.xml",
+ "classpath:coreContext.xml",
"classpath:restTestEnv.xml",
"classpath:persistenceContext.xml",
"classpath:schedulingContext.xml",
@@ -94,17 +94,17 @@ public class NotificationTest {
*/
private static final Logger LOG = LoggerFactory.getLogger(NotificationTest.class);
- private static final String smtpHost = "localhost";
+ private static final String SMTP_HOST = "localhost";
- private static final int smtpPort = 2525;
+ private static final int SMTP_PORT = 2525;
- private static final String pop3Host = "localhost";
+ private static final String POP3_HOST = "localhost";
- private static final int pop3Port = 1110;
+ private static final int POP3_PORT = 1110;
- private static final String mailAddress = "notificationtest@syncope.apache.org";
+ private static final String MAIL_ADDRESS = "notificationtest@syncope.apache.org";
- private static final String mailPassword = "password";
+ private static final String MAIL_PASSWORD = "password";
private static GreenMail greenMail;
@@ -144,10 +144,10 @@ public class NotificationTest {
@BeforeClass
public static void startGreenMail() {
ServerSetup[] config = new ServerSetup[2];
- config[0] = new ServerSetup(smtpPort, smtpHost, ServerSetup.PROTOCOL_SMTP);
- config[1] = new ServerSetup(pop3Port, pop3Host, ServerSetup.PROTOCOL_POP3);
+ config[0] = new ServerSetup(SMTP_PORT, SMTP_HOST, ServerSetup.PROTOCOL_SMTP);
+ config[1] = new ServerSetup(POP3_PORT, POP3_HOST, ServerSetup.PROTOCOL_POP3);
greenMail = new GreenMail(config);
- greenMail.setUser(mailAddress, mailPassword);
+ greenMail.setUser(MAIL_ADDRESS, MAIL_PASSWORD);
greenMail.start();
}
@@ -174,10 +174,10 @@ public class NotificationTest {
public void setupSMTP() throws Exception {
JavaMailSenderImpl sender = (JavaMailSenderImpl) mailSender;
sender.setDefaultEncoding(SyncopeConstants.DEFAULT_ENCODING);
- sender.setHost(smtpHost);
- sender.setPort(smtpPort);
- sender.setUsername(mailAddress);
- sender.setPassword(mailPassword);
+ sender.setHost(SMTP_HOST);
+ sender.setPort(SMTP_PORT);
+ sender.setUsername(MAIL_ADDRESS);
+ sender.setPassword(MAIL_PASSWORD);
}
private boolean verifyMail(final String sender, final String subject) throws Exception {
@@ -190,7 +190,7 @@ public class NotificationTest {
boolean found = false;
Session session = Session.getDefaultInstance(System.getProperties());
Store store = session.getStore("pop3");
- store.connect(pop3Host, pop3Port, mailAddress, mailPassword);
+ store.connect(POP3_HOST, POP3_PORT, MAIL_ADDRESS, MAIL_PASSWORD);
Folder inbox = store.getFolder("INBOX");
assertNotNull(inbox);
@@ -234,7 +234,7 @@ public class NotificationTest {
notificationDAO.flush();
// 2. create user
- UserTO userTO = UserTestITCase.getSampleTO(mailAddress);
+ UserTO userTO = UserTestITCase.getSampleTO(MAIL_ADDRESS);
MembershipTO membershipTO = new MembershipTO();
membershipTO.setRoleId(7);
userTO.getMemberships().add(membershipTO);
@@ -291,7 +291,7 @@ public class NotificationTest {
assertNotNull(actual);
// 2. create user
- UserTO userTO = UserTestITCase.getSampleTO(mailAddress);
+ UserTO userTO = UserTestITCase.getSampleTO(MAIL_ADDRESS);
MembershipTO membershipTO = new MembershipTO();
membershipTO.setRoleId(7);
userTO.getMemberships().add(membershipTO);
@@ -344,7 +344,7 @@ public class NotificationTest {
notificationDAO.flush();
// 2. create user
- UserTO userTO = UserTestITCase.getSampleTO(mailAddress);
+ UserTO userTO = UserTestITCase.getSampleTO(MAIL_ADDRESS);
MembershipTO membershipTO = new MembershipTO();
membershipTO.setRoleId(7);
userTO.getMemberships().add(membershipTO);
@@ -394,7 +394,7 @@ public class NotificationTest {
notificationDAO.flush();
// 2. create user
- UserTO userTO = UserTestITCase.getSampleTO(mailAddress);
+ UserTO userTO = UserTestITCase.getSampleTO(MAIL_ADDRESS);
MembershipTO membershipTO = new MembershipTO();
membershipTO.setRoleId(7);
userTO.getMemberships().add(membershipTO);
@@ -465,7 +465,7 @@ public class NotificationTest {
notificationDAO.flush();
// 2. create user
- UserTO userTO = UserTestITCase.getSampleTO(mailAddress);
+ UserTO userTO = UserTestITCase.getSampleTO(MAIL_ADDRESS);
MembershipTO membershipTO = new MembershipTO();
membershipTO.setRoleId(7);
userTO.getMemberships().add(membershipTO);
@@ -526,7 +526,7 @@ public class NotificationTest {
final int tasksNumberBefore = taskDAO.findAll(NotificationTask.class).size();
// 2. create user
- UserTO userTO = UserTestITCase.getUniqueSampleTO(mailAddress);
+ UserTO userTO = UserTestITCase.getUniqueSampleTO(MAIL_ADDRESS);
MembershipTO membershipTO = new MembershipTO();
membershipTO.setRoleId(7);
userTO.getMemberships().add(membershipTO);
@@ -552,7 +552,7 @@ public class NotificationTest {
notification.setRecipientAttrName("email");
notification.setRecipientAttrType(IntMappingType.UserSchema);
- notification.getStaticRecipients().add(mailAddress);
+ notification.getStaticRecipients().add(MAIL_ADDRESS);
Random random = new Random(System.currentTimeMillis());
String sender = "syncopetest-" + random.nextLong() + "@syncope.apache.org";
@@ -592,7 +592,7 @@ public class NotificationTest {
assertNotNull(taskId);
assertNotNull(textBody);
- assertTrue(recipients.contains(mailAddress));
+ assertTrue(recipients.contains(MAIL_ADDRESS));
// 5. execute Notification task and verify e-mail
taskController.execute(taskId, false);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttributableSearchTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttributableSearchTest.java?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttributableSearchTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttributableSearchTest.java Wed Jul 30 15:06:37 2014
@@ -25,15 +25,14 @@ import static org.junit.Assert.assertTru
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
-import org.apache.syncope.core.persistence.dao.search.AttributeCond;
-import org.apache.syncope.core.persistence.dao.search.SearchCond;
import org.apache.syncope.common.types.SubjectType;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.persistence.dao.SubjectSearchDAO;
import org.apache.syncope.core.persistence.dao.EntitlementDAO;
import org.apache.syncope.core.persistence.dao.RoleDAO;
+import org.apache.syncope.core.persistence.dao.SubjectSearchDAO;
+import org.apache.syncope.core.persistence.dao.search.AttributeCond;
+import org.apache.syncope.core.persistence.dao.search.SearchCond;
import org.apache.syncope.core.util.EntitlementUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,8 +42,12 @@ import org.springframework.test.context.
import org.springframework.transaction.annotation.Transactional;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath:syncopeContext.xml", "classpath:persistenceContext.xml",
- "classpath:schedulingContext.xml", "classpath:workflowContext.xml" })
+@ContextConfiguration(locations = {
+ "classpath:coreContext.xml",
+ "classpath:persistenceContext.xml",
+ "classpath:schedulingContext.xml",
+ "classpath:workflowContext.xml"
+})
@Transactional
public class AttributableSearchTest {
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java Wed Jul 30 15:06:37 2014
@@ -27,7 +27,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Iterator;
@@ -53,7 +52,6 @@ import org.apache.syncope.common.types.C
import org.apache.syncope.common.types.ConnectorCapability;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.SyncopeClientException;
-import org.apache.syncope.core.util.ConnIdBundleManager;
import org.identityconnectors.common.security.GuardedString;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@@ -63,6 +61,8 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class ConnectorTestITCase extends AbstractTest {
+ private static String connectorServerLocation;
+
private static String connidSoapVersion;
private static String connidDbTableVersion;
@@ -74,18 +74,25 @@ public class ConnectorTestITCase extends
InputStream propStream = null;
try {
Properties props = new Properties();
- propStream = ConnectorTestITCase.class.getResourceAsStream(ConnIdBundleManager.CONNID_PROPS);
+ propStream = ConnectorTestITCase.class.getResourceAsStream("/connid.properties");
props.load(propStream);
+ for (String location : props.getProperty("connid.locations").split(",")) {
+ if (!location.startsWith("file")) {
+ connectorServerLocation = location;
+ }
+ }
+
connidSoapVersion = props.getProperty("connid.soap.version");
connidDbTableVersion = props.getProperty("connid.db.table.version");
testJDBCURL = props.getProperty("testdb.url");
} catch (Exception e) {
- LOG.error("Could not load {}", ConnIdBundleManager.CONNID_PROPS, e);
+ LOG.error("Could not load /connid.properties", e);
} finally {
IOUtils.closeQuietly(propStream);
}
+ assertNotNull(connectorServerLocation);
assertNotNull(connidSoapVersion);
assertNotNull(connidDbTableVersion);
assertNotNull(testJDBCURL);
@@ -427,22 +434,10 @@ public class ConnectorTestITCase extends
@Test
public void validate() {
ConnInstanceTO connectorTO = new ConnInstanceTO();
-
- for (URI location : ConnIdBundleManager.getConnManagers().keySet()) {
- if (!location.getScheme().equals("file")) {
- connectorTO.setLocation(location.toString());
- }
- }
-
- // set connector version
+ connectorTO.setLocation(connectorServerLocation);
connectorTO.setVersion(connidDbTableVersion);
-
- // set connector name
connectorTO.setConnectorName("org.connid.bundles.db.table.DatabaseTableConnector");
-
- // set bundle name
connectorTO.setBundleName("org.connid.bundles.db.table");
-
connectorTO.setDisplayName("H2Test");
// set the connector configuration using PropertyTO
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java Wed Jul 30 15:06:37 2014
@@ -417,7 +417,7 @@ public class TaskTestITCase extends Abst
@Test
public void reconcileFromDB() {
// update sync task
- TaskExecTO execution = execSyncTask(7L, 20, false);
+ TaskExecTO execution = execSyncTask(7L, 50, false);
assertNotNull(execution.getStatus());
assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful());
@@ -431,7 +431,7 @@ public class TaskTestITCase extends Abst
jdbcTemplate.execute("UPDATE TEST SET STATUS=TRUE");
// re-execute the same SyncTask: now user must be active
- execution = execSyncTask(7L, 20, false);
+ execution = execSyncTask(7L, 50, false);
assertNotNull(execution.getStatus());
assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful());
@@ -472,7 +472,7 @@ public class TaskTestITCase extends Abst
ldapCleanup();
// Update sync task
- TaskExecTO execution = execSyncTask(11L, 20, false);
+ TaskExecTO execution = execSyncTask(11L, 50, false);
// 1. verify execution status
final String status = execution.getStatus();
@@ -743,7 +743,7 @@ public class TaskTestITCase extends Abst
@Test
public void issueSYNCOPE230() {
// 1. read SyncTask for resource-db-sync (table TESTSYNC on external H2)
- execSyncTask(10L, 20, false);
+ execSyncTask(10L, 50, false);
// 3. read e-mail address for user created by the SyncTask first execution
UserTO userTO = readUser("issuesyncope230");
@@ -756,7 +756,7 @@ public class TaskTestITCase extends Abst
jdbcTemplate.execute("UPDATE TESTSYNC SET email='updatedSYNCOPE230@syncope.apache.org'");
// 5. re-execute the SyncTask
- execSyncTask(10L, 20, false);
+ execSyncTask(10L, 50, false);
// 6. verify that the e-mail was updated
userTO = readUser("issuesyncope230");
@@ -767,7 +767,6 @@ public class TaskTestITCase extends Abst
}
private TaskExecTO execSyncTask(final Long taskId, final int maxWaitSeconds, final boolean dryRun) {
-
AbstractTaskTO taskTO = taskService.read(taskId);
assertNotNull(taskTO);
assertNotNull(taskTO.getExecutions());
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java Wed Jul 30 15:06:37 2014
@@ -38,7 +38,11 @@ public class DoubleValueAttributableTran
if (NAME.equals(attr.getSchema())) {
List<String> values = new ArrayList<String>(attr.getValues().size());
for (String value : attr.getValues()) {
- values.add(String.valueOf(2 * Long.valueOf(value)));
+ try {
+ values.add(String.valueOf(2 * Long.valueOf(value)));
+ } catch (NumberFormatException e) {
+ // ignore
+ }
}
attr.getValues().clear();
attr.getValues().addAll(values);
@@ -54,7 +58,11 @@ public class DoubleValueAttributableTran
if (NAME.equals(attr.getSchema())) {
List<String> values = new ArrayList<String>(attr.getValuesToBeAdded().size());
for (String value : attr.getValuesToBeAdded()) {
- values.add(String.valueOf(2 * Long.valueOf(value)));
+ try {
+ values.add(String.valueOf(2 * Long.valueOf(value)));
+ } catch (NumberFormatException e) {
+ // ignore
+ }
}
attr.getValuesToBeAdded().clear();
attr.getValuesToBeAdded().addAll(values);
Modified: syncope/trunk/core/src/test/resources/content.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Wed Jul 30 15:06:37 2014
@@ -33,8 +33,6 @@ under the License.
+ provided as non-empty string: NotificationJob runs according to the given value -->
<CSchema name="notificationjob.cronExpression" type="String"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CAttr id="2" owner_id="1" schema_name="notificationjob.cronExpression"/>
- <CAttrValue id="2" attribute_id="2" stringValue=""/>
<CSchema name="notification.maxRetries" type="Long"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
@@ -582,8 +580,8 @@ under the License.
createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
- <ExternalResource_propagationActionsClassNames externalResource_name="resource-ldap"
- element="org.apache.syncope.core.propagation.impl.LDAPMembershipPropagationActions"/>
+ <ExternalResource_PropActions externalResource_name="resource-ldap"
+ element="org.apache.syncope.core.propagation.impl.LDAPMembershipPropagationActions"/>
<ExternalResource name="ws-target-resource-nopropagation" connector_id="103"
randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
Modified: syncope/trunk/core/src/test/resources/context.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/context.xml?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/context.xml (original)
+++ syncope/trunk/core/src/test/resources/context.xml Wed Jul 30 15:06:37 2014
@@ -19,5 +19,5 @@ under the License.
-->
<Context>
<!-- Disable session persistence across Tomcat restarts -->
- <Manager pathname="" />
+ <Manager pathname=""/>
</Context>
Modified: syncope/trunk/core/src/test/resources/mysql/persistence.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/mysql/persistence.properties?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/mysql/persistence.properties (original)
+++ syncope/trunk/core/src/test/resources/mysql/persistence.properties Wed Jul 30 15:06:37 2014
@@ -25,3 +25,4 @@ quartz.jobstore=org.quartz.impl.jdbcjobs
quartz.scheduler.idleWaitTime=5000
quartz.sql=tables_mysql.sql
audit.sql=audit.sql
+database.schema=
\ No newline at end of file
Modified: syncope/trunk/core/src/test/resources/oracle/persistence.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/oracle/persistence.properties?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/oracle/persistence.properties (original)
+++ syncope/trunk/core/src/test/resources/oracle/persistence.properties Wed Jul 30 15:06:37 2014
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
jpa.driverClassName=oracle.jdbc.OracleDriver
-jpa.url=jdbc:oracle:thin:@pioppo:1521:orcl
+jpa.url=jdbc:oracle:thin:@localhost:1521:xe
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.OracleDictionary
@@ -25,4 +25,4 @@ quartz.jobstore=org.quartz.impl.jdbcjobs
quartz.scheduler.idleWaitTime=5000
quartz.sql=tables_oracle.sql
audit.sql=audit_oracle.sql
-database.schema=SYNCOPE
+database.schema=SYNCOPE
\ No newline at end of file
Modified: syncope/trunk/core/src/test/resources/persistence.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/persistence.properties?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/persistence.properties (original)
+++ syncope/trunk/core/src/test/resources/persistence.properties Wed Jul 30 15:06:37 2014
@@ -25,3 +25,4 @@ quartz.jobstore=org.quartz.impl.jdbcjobs
quartz.scheduler.idleWaitTime=5000
quartz.sql=tables_h2.sql
audit.sql=audit.sql
+database.schema=
\ No newline at end of file
Modified: syncope/trunk/core/src/test/resources/postgres/persistence.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/postgres/persistence.properties?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/postgres/persistence.properties (original)
+++ syncope/trunk/core/src/test/resources/postgres/persistence.properties Wed Jul 30 15:06:37 2014
@@ -25,3 +25,4 @@ quartz.jobstore=org.quartz.impl.jdbcjobs
quartz.scheduler.idleWaitTime=5000
quartz.sql=tables_postgres.sql
audit.sql=audit.sql
+database.schema=
\ No newline at end of file
Modified: syncope/trunk/core/src/test/resources/sqlserver/persistence.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/sqlserver/persistence.properties?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/sqlserver/persistence.properties (original)
+++ syncope/trunk/core/src/test/resources/sqlserver/persistence.properties Wed Jul 30 15:06:37 2014
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
jpa.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-jpa.url=jdbc:sqlserver://acacia:1433;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
+jpa.url=jdbc:sqlserver://localhost:1433;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary
@@ -25,3 +25,4 @@ quartz.jobstore=org.quartz.impl.jdbcjobs
quartz.scheduler.idleWaitTime=5000
quartz.sql=tables_sqlServer.sql
audit.sql=audit_sqlserver.sql
+database.schema=
\ No newline at end of file
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Jul 30 15:06:37 2014
@@ -342,13 +342,13 @@ under the License.
<wicket.version>6.16.0</wicket.version>
- <groovy.version>2.3.3</groovy.version>
+ <groovy.version>2.3.4</groovy.version>
- <h2.version>1.4.179</h2.version>
+ <h2.version>1.4.180</h2.version>
<log4j.version>2.0</log4j.version>
<slf4j.version>1.7.7</slf4j.version>
- <disruptor.version>3.2.1</disruptor.version>
+ <disruptor.version>3.3.0</disruptor.version>
<junit.version>4.11</junit.version>
<selenium.version>2.42.2</selenium.version>
@@ -357,7 +357,7 @@ under the License.
<httpclient.version>4.3.4</httpclient.version>
- <tomcat.version>7.0.54</tomcat.version>
+ <tomcat.version>7.0.55</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>
@@ -368,6 +368,7 @@ under the License.
<izpack.version>5.0.0-rc2</izpack.version>
+ <conf.directory>${project.build.directory}/test-classes</conf.directory>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
<connid.location>file:${bundles.directory}/</connid.location>
<log.directory>${project.build.directory}/log</log.directory>
Modified: syncope/trunk/standalone/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/standalone/pom.xml?rev=1614680&r1=1614679&r2=1614680&view=diff
==============================================================================
--- syncope/trunk/standalone/pom.xml (original)
+++ syncope/trunk/standalone/pom.xml Wed Jul 30 15:06:37 2014
@@ -89,54 +89,55 @@ under the License.
<phase>verify</phase>
<configuration>
<target>
- <mkdir dir="${work.dir}" />
+ <mkdir dir="${work.dir}"/>
<!-- legal stuff -->
- <copy file="${project.build.outputDirectory}/README" todir="${work.dir}" />
- <copy file="../legal_ext/LICENSE" todir="${work.dir}" />
- <copy file="../legal_ext/NOTICE" todir="${work.dir}" />
+ <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"/>
+ <copy file="../legal_ext/LICENSE" todir="${work.dir}"/>
+ <copy file="../legal_ext/NOTICE" todir="${work.dir}"/>
<!-- Unzip Tomcat and remove docs and examples from webapps (space saving) -->
- <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip" dest="${work.dir}" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/docs" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/examples" />
+ <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip"
+ dest="${work.dir}"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/docs"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/examples"/>
<!-- Syncope core (as run for integration tests) -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope">
- <fileset dir="../core/target/syncope-core-test" includes="**/*" />
+ <fileset dir="../core/target/syncope-core-test" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/core" />
+ <fileset dir="${project.build.outputDirectory}/core"/>
</copy>
<!-- Syncope console (exploded) -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console">
- <fileset dir="../console/target/syncope-console" includes="**/*" />
+ <fileset dir="../console/target/syncope-console" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/console" />
+ <fileset dir="${project.build.outputDirectory}/console"/>
</copy>
<!-- ConnId's SOAP wssample (provides endpoint for SOAP resources) -->
- <copy file="${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war" />
+ <copy file="${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war"/>
<!-- Syncope build tools (provide H2 and Apache DS resources + ConnId connector server) -->
- <unzip src="../build-tools/target/syncope-build-tools-${project.version}.war" dest="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+ <unzip src="../build-tools/target/syncope-build-tools-${project.version}.war" dest="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools/WEB-INF/lib">
- <fileset dir="../core/target/bundles" includes="**/*" />
+ <fileset dir="../core/target/bundles" includes="**/*"/>
</copy>
- <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+ <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
<!-- Tomcat shared libraries: H2 and groovy -->
- <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
- <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
+ <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
+ <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
<!-- Other custom Tomcat resources -->
- <copy file="../core/target/test-classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true" />
- <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}" />
+ <copy file="../core/target/test-classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true"/>
+ <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}"/>
</target>
</configuration>
</execution>
@@ -177,7 +178,7 @@ under the License.
<filtering>true</filtering>
<targetPath>core</targetPath>
<includes>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</resource>
<resource>
@@ -185,7 +186,7 @@ under the License.
<filtering>true</filtering>
<targetPath>console</targetPath>
<includes>
- <include>configuration.properties</include>
+ <include>console.properties</include>
</includes>
</resource>
<resource>
@@ -193,7 +194,7 @@ under the License.
<filtering>true</filtering>
<targetPath>console</targetPath>
<includes>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</resource>
<resource>