Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into closure
Browse files Browse the repository at this point in the history 
Conflicts:
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
  • Loading branch information
@1azyman
1azyman committed Jul 19, 2014
2 parents f10aedc + 87345af commit d700179
Show file tree
Hide file tree
Showing 1,242 changed files with 62,850 additions and 25,287 deletions.
31 changes: 31 additions & 0 deletions NEWS
View file
@@ -0,0 +1,31 @@
midPoint 3.0 "Newton"
---------------------

* Generic synchronization: synchronize almost any type of object to the resource
* Entitlement management support allows management of resource groups, privileges and roles in a native and convenient way.
* Delegated Administration: ability to define fine-grained authorizations scoped to a specific organizational unit. Attribute-level authorizations.
* REST API
* Improved reporting (based on Jasper Reports)
* Performance improvements
* Bulk actions: Ability to execute an action on all users/accounts (or subset).
* GUI improvements: Improved GUI design and ergonomics, ability to conveniently adjust some aspects of GUI look&feel
* Switch to common OpenICF/ConnId 1.4 framework
* Schema and interface cleanup
* Scripting Hooks
* Schema documentation automatically generated from the definition (schemadoc)
* Higher-order inducements
* New expression evaluators for assignments and entitlement associations
* Iteration support for focal objects (e.g. users)
* New administration GUI pages
* Partial multi-tenancy support
* Support for resource read-only mode
* Extended function libraries for expressions
* Support for time-based mappings in object template
* Improved synchronization reaction configuration options
* Improved reconciliation and synchronization performance
* Support for filters in protected accounts specification
* Support for binary attribute values
* Support for user photo
* Schema improvements
* Improved logging messages

21 changes: 15 additions & 6 deletions README
View file
@@ -1,24 +1,33 @@
midPoint 3.0 "Newton"
---------------------

General informations:

midPoint is a tool that synchronizes several identity repositories, manages them
and makes them available in unified form. It belongs to the user provisioning
category of the enterprise identity management field. The basic features include:
MidPoint is a comprehensive identity provisioning system. MidPoint can synchronize several
identity repositories, manage and transform data in these repostories to keep them synchronized.
MidPoint also makes the data available in unified form.

The most important features of midPoint are:
- User provisioning and deprovisioning
- Integration of Identity Connector Framework
- Administration GUI
- Identity repository implemention (SQL)
- Custom schema extensibility
- Identity synchronization (liveSync, reconciliation, discovery, import)
- Support for expressions in synchronization mappings (Groovy, JavaScript, XPathv2)
- Advanced RBAC support
- Advanced RBAC support with temporal constraints
- Identity management process automation (workflow, notifications)
- Password policies
- Generic synchronization
- Entitlements
- Support for ConnId and OpenICF connectors
- Provisioning consistency and error handling
- Segregation of Duties (SoG)
- Support for security auditing and reporting
- Local Java APIs
- Remote web service interface
- Workflow
- Reporting
- Notifications
- Local Java APIs, Remote web service interface (SOAP), REST API
- High availablity (HA) support


Expand Down
3 changes: 2 additions & 1 deletion RELEASE-NOTES
View file
@@ -1,3 +1,4 @@
To see actual releases notes please go to:

http://wiki.evolveum.com/display/midPoint/midPoint+Releases
https://wiki.evolveum.com/display/midPoint/Release+3.0

50 changes: 44 additions & 6 deletions build-system/pom.xml
View file
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
</parent>
<pluginRepositories>
<pluginRepository>
Expand All @@ -45,8 +45,8 @@
<commons.io.version>2.0.1</commons.io.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.cli>1.2</commons.cli>
<cxf.version>2.7.6</cxf.version>
<cxf-xjc.version>2.4.0</cxf-xjc.version>
<cxf.version>3.0.1.e1</cxf.version>
<cxf-xjc.version>3.0.1</cxf-xjc.version>
<dbunit.version>2.4.7</dbunit.version>
<jaxb.version>2.2.7</jaxb.version>
<jaxb-xjc.version>2.2.7</jaxb-xjc.version>
Expand All @@ -65,11 +65,13 @@
<h2.version>1.3.171</h2.version>
<jdbc.postgres>9.1-901.jdbc4</jdbc.postgres>
<jdbc.mysql>5.1.25</jdbc.mysql>
<wicket.version>6.14.0</wicket.version>
<wicket.version>6.16.0</wicket.version>
<groovy.version>1.8.6</groovy.version>
<activiti-engine.version>5.15.1</activiti-engine.version>
<activiti-spring.version>5.15.1</activiti-spring.version>
<commons-email.version>1.3</commons-email.version>
<xmlsec.version>2.0.1</xmlsec.version>
<connid.version>1.4.0.0-SNAPSHOT</connid.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -266,11 +268,26 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Expand Down Expand Up @@ -316,6 +333,21 @@
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>cxf-xjc-runtime</artifactId>
<version>${cxf-xjc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
Expand All @@ -330,12 +362,12 @@
<dependency>
<groupId>org.connid</groupId>
<artifactId>connector-framework</artifactId>
<version>1.4.0.0-SNAPSHOT</version>
<version>${connid.version}</version>
</dependency>
<dependency>
<groupId>org.connid</groupId>
<artifactId>connector-framework-internal</artifactId>
<version>1.4.0.0-SNAPSHOT</version>
<version>${connid.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.openicf.connectors</groupId>
Expand Down Expand Up @@ -407,6 +439,12 @@
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
</dependency>




Expand Down
2 changes: 2 additions & 0 deletions config/sql/midpoint/2.3/h2/h2-2.3.sql → config/sql/midpoint/3.0/h2/h2-3.0.sql
View file
Expand Up @@ -661,6 +661,8 @@ ADD CONSTRAINT fk_node
FOREIGN KEY (oid)
REFERENCES m_object;

CREATE INDEX iObjectCreateTimestamp ON m_object (createTimestamp);

CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass);

CREATE INDEX iObjectNameOrig ON m_object (name_orig);
Expand Down
2 changes: 2 additions & 0 deletions config/sql/midpoint/2.3/mysql/mysql-2.3.sql → config/sql/midpoint/3.0/mysql/mysql-3.0.sql
View file
Expand Up @@ -830,6 +830,8 @@ ADD CONSTRAINT fk_node
FOREIGN KEY (oid)
REFERENCES m_object (oid);

CREATE INDEX iObjectCreateTimestamp ON m_object (createTimestamp);

CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass);

CREATE INDEX iObjectNameOrig ON m_object (name_orig);
Expand Down
2 changes: 2 additions & 0 deletions ...ig/sql/midpoint/2.3/oracle/oracle-2.3.sql → ...ig/sql/midpoint/3.0/oracle/oracle-3.0.sql
View file
Expand Up @@ -666,6 +666,8 @@ ADD CONSTRAINT fk_node
FOREIGN KEY (oid)
REFERENCES m_object;

CREATE INDEX iObjectCreateTimestamp ON m_object (createTimestamp) INITRANS 30;

CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass) INITRANS 30;

CREATE INDEX iObjectNameOrig ON m_object (name_orig) INITRANS 30;
Expand Down
2 changes: 2 additions & 0 deletions ...idpoint/2.3/postgresql/postgresql-2.3.sql → ...idpoint/3.0/postgresql/postgresql-3.0.sql
View file
Expand Up @@ -663,6 +663,8 @@ ADD CONSTRAINT fk_node
FOREIGN KEY (oid)
REFERENCES m_object;

CREATE INDEX iObjectCreateTimestamp ON m_object (createTimestamp);

CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass);

CREATE INDEX iObjectNameOrig ON m_object (name_orig);
Expand Down
2 changes: 2 additions & 0 deletions .../midpoint/2.3/sqlserver/sqlserver-2.3.sql → .../midpoint/3.0/sqlserver/sqlserver-3.0.sql
View file
Expand Up @@ -663,6 +663,8 @@ ADD CONSTRAINT fk_node
FOREIGN KEY (oid)
REFERENCES m_object;

CREATE INDEX iObjectCreateTimestamp ON m_object (createTimestamp);

CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass);

CREATE INDEX iObjectNameOrig ON m_object (name_orig);
Expand Down
25 changes: 14 additions & 11 deletions config/sql/quartz/tables_oracle.sql
View file
Expand Up @@ -10,17 +10,20 @@


-- there are two semicolons at the end of each of the following lines to work around a bug/feature of ScriptRunner we use
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_calendars'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_fired_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_blob_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_cron_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_simple_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_simprop_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_job_details'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_paused_trigger_grps'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_locks'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_scheduler_state'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;;
BEGIN
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_calendars'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_fired_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_blob_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_cron_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_simple_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_simprop_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_triggers'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_job_details'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_paused_trigger_grps'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_locks'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
BEGIN EXECUTE IMMEDIATE 'DROP TABLE qrtz_scheduler_state'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;
END;
/

CREATE TABLE qrtz_job_details
(
Expand Down
2 changes: 1 addition & 1 deletion config/sql/quartz/tables_sqlServer.sql
View file
Expand Up @@ -80,7 +80,7 @@ DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS];
-- GO

IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPROP_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS];
DROP TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS];
-- GO

IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
Expand Down
54 changes: 54 additions & 0 deletions custom/pom.xml
View file
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2014 Evolveum
~
~ Licensed 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.
-->

<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">
<modelVersion>4.0.0</modelVersion>
<name>midPoint Customizations</name>
<artifactId>custom</artifactId>
<packaging>pom</packaging>
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>3.1-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
<name>Evolveum</name>
<url>http://www.evolveum.com</url>
</organization>
<licenses>
<license>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<issueManagement>
<system>Atlassian JIRA</system>
<url>http://jira.evolveum.com/</url>
</issueManagement>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>
<modules>
<!-- add submodule here:
<module>custom-foo</module>
-->
</modules>
</project>
10 changes: 5 additions & 5 deletions dist/midpoint-api/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
<relativePath>../../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand All @@ -51,22 +51,22 @@
<dependency>
<groupId>com.evolveum.midpoint.model</groupId>
<artifactId>model-api</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>common</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>schema</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>util</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
8 changes: 4 additions & 4 deletions dist/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
<relativePath>../build-system/pom.xml</relativePath>
</parent>
<organization>
Expand All @@ -51,20 +51,20 @@
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>repo-ninja</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
<type>zip</type>
<classifier>bin</classifier>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>repo-ninja</artifactId>
<version>2.3-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down

0 comments on commit d700179

Please sign in to comment.