Merge remote-tracking branch 'origin/master'

dist/src/main/bin/springboot.sh

@@ -1,4 +1,20 @@
 #!/bin/bash
+#
+# 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.
+#
+# Parts of this file Copyright (c) 2017 Evolveum
+#
+
 SCRIPT_PATH=$(cd $(dirname "$0") && pwd -P)/$(basename "$2")
 USE_NOHUP="true"
 JAVA_OPTS="$JAVA_OPTS -Xms2048M -Xmx2048M -XX:PermSize=128m -XX:MaxPermSize=256m -Dmidpoint.home=$SCRIPT_PATH../var"

dist/src/main/bin/start.sh

@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# 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.
+#
+# Parts of this file Copyright (c) 2017 Evolveum
+#
 
 # resolve links - $0 may be a softlink
 PRG="$0"

dist/src/main/bin/stop.sh

@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# 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.
+#
+# Parts of this file Copyright (c) 2017 Evolveum
+#
 
 # resolve links - $0 may be a softlink
 PRG="$0"

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java

@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
 import com.evolveum.midpoint.gui.api.util.ModelServiceLocator;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.delta.builder.DeltaBuilder;
 import com.evolveum.midpoint.prism.path.ItemPath;
@@ -373,7 +374,18 @@ private <C extends Containerable> ReferenceWrapper createReferenceWrapper(PrismR
 	     if (QNameUtil.match(AbstractRoleType.F_APPROVER_REF, def.getName()) || QNameUtil.match(AbstractRoleType.F_APPROVER_REF, def.getName())) {
 	    	 refWrapper.setTargetTypes(Arrays.asList(FocusType.COMPLEX_TYPE, OrgType.COMPLEX_TYPE));
 	     } else {
-	    	 refWrapper.setTargetTypes(Arrays.asList(def.getTargetTypeName()));
+
+	    	 QName targetType = def.getTargetTypeName();
+
+	    	 if (targetType == null || ObjectType.COMPLEX_TYPE.equals(targetType)) {
+	    		 refWrapper.setTargetTypes(WebComponentUtil.createObjectTypeList());
+	    	 } else if (AbstractRoleType.COMPLEX_TYPE.equals(targetType)) {
+	    		 refWrapper.setTargetTypes(WebComponentUtil.createAbstractRoleTypeList());
+	    	 } else if (FocusType.COMPLEX_TYPE.equals(targetType)) {
+	    		 refWrapper.setTargetTypes(WebComponentUtil.createFocusTypeList());
+	    	 } else {
+	    		 refWrapper.setTargetTypes(Arrays.asList(def.getTargetTypeName()));
+	    	 }
 	     }
 
 	     return refWrapper;

infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd

@@ -523,9 +523,9 @@
 	                                range of roles - assuming that runtime resolution is used.
 	                            </p>
                             </xsd:documentation>
-							<xsd:appinfo>
-								<a:objectReferenceTargetType>c:AbstractRoleType</a:objectReferenceTargetType>
-							</xsd:appinfo>
+                            <xsd:appinfo>
+					         		<a:objectReferenceTargetType>tns:AbstractRoleType</a:objectReferenceTargetType>
+					        </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
                     <xsd:element name="policy" type="tns:ExclusionPolicyType" minOccurs="0">

provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java

@@ -711,6 +711,12 @@ public void testConnection(PrismObject<ResourceType> resource, Task task, Operat
 			testConnectionConnector(connectorSpec, capabilityMap, task, connectorTestResult);
 
 			connectorTestResult.computeStatus();
+
+			if (!connectorTestResult.isAcceptable()) {
+				//nothing more to do.. if it failed while testing connection, status is set. 
+				// we do not need to continue and waste the time.
+				return;
+			}
 		}
 
 		// === test SCHEMA ===

testing/longtest/pom.xml

@@ -132,6 +132,11 @@
 			<version>3.7-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.icf</groupId>
+			<artifactId>dummy-resource</artifactId>
+			<version>3.7-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-test-util</artifactId>