Skip to content

Commit

Permalink
Backporting fix for MID-1224
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Mar 16, 2013
1 parent 07e563f commit 019b5af
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 73 deletions.
3 changes: 3 additions & 0 deletions infra/schema/src/main/resources/META-INF/catalog.xml
View file
Expand Up @@ -38,6 +38,9 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="../xml/ns/public/connector/icf-1/connector-schema-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="../xml/ns/public/connector/icf-1/connector-schema-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2" uri="../xml/ns/public/resource/capabilities-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2" uri="../xml/ns/public/resource/capabilities-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-2.xsd" />

Expand Down
6 changes: 5 additions & 1 deletion infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
View file
Expand Up @@ -52,7 +52,7 @@

<import namespace="http://midpoint.evolveum.com/xml/ns/public/common/fault-1.wsdl"
location="../common/fault-1.wsdl"/>

<types>
<xsd:schema targetNamespace="http://midpoint.evolveum.com/xml/ns/public/model/model-1.wsdl">
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
Expand All @@ -61,6 +61,10 @@
schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/api-types-2"/>
<xsd:import namespace="http://prism.evolveum.com/xml/ns/public/query-2"
schemaLocation="http://prism.evolveum.com/xml/ns/public/query-2"/>
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2"
schemaLocation="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2"/>
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2"
schemaLocation="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2"/>
</xsd:schema>
</types>

Expand Down
3 changes: 2 additions & 1 deletion infra/schema/src/main/resources/xml/ns/public/resource/capabilities-2.xsd
View file
Expand Up @@ -44,7 +44,8 @@
</xsd:appinfo>
</xsd:annotation>

<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-2a" schemaLocation="../common/common-2a.xsd">
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-2a"
schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-2a">
<xsd:annotation>
<xsd:documentation>
Import of the common schema. Some datatypes are reused here.
Expand Down
67 changes: 0 additions & 67 deletions model/model-client/pom.xml
View file
Expand Up @@ -191,44 +191,6 @@
</extraargs>
</wsdlOption>
</wsdlOptions>
<!-- <xsdOptions>
<xsdOption>
<xsd>src/main/resources/xml/ns/public/common/common-2a.xsd</xsd>
<extensionArgs>
<extensionArg>-Xts</extensionArg>
<extensionArg>-Xequals</extensionArg>
<extensionArg>-xjc-XhashCode</extensionArg>
</extensionArgs>
<extension>true</extension>
</xsdOption>
<xsdOption>
<xsd>src/main/resources/xml/ns/public/resource/capabilities-2.xsd</xsd>
<extensionArgs>
<extensionArg>-Xts</extensionArg>
<extensionArg>-Xequals</extensionArg>
<extensionArg>-xjc-XhashCode</extensionArg>
</extensionArgs>
<extension>true</extension>
</xsdOption>
<xsdOption>
<xsd>src/main/resources/xml/ns/public/connector/icf-1/resource-schema-2.xsd</xsd>
<extensionArgs>
<extensionArg>-Xts</extensionArg>
<extensionArg>-Xequals</extensionArg>
<extensionArg>-xjc-XhashCode</extensionArg>
</extensionArgs>
<extension>true</extension>
</xsdOption>
<xsdOption>
<xsd>src/main/resources/xml/ns/public/connector/icf-1/connector-schema-2.xsd</xsd>
<extensionArgs>
<extensionArg>-Xts</extensionArg>
<extensionArg>-Xequals</extensionArg>
<extensionArg>-xjc-XhashCode</extensionArg>
</extensionArgs>
<extension>true</extension>
</xsdOption>
</xsdOptions> -->
</configuration>
<goals>
<goal>wsdl2java</goal>
Expand All @@ -253,35 +215,6 @@
</dependency>
</dependencies>
</plugin>
<!--
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>${cxf-xjc.version}</version>
<configuration>
<extensions>
<extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf-xjc.version}</extension>
</extensions>
</configuration>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>xsdtojava</goal>
</goals>
<configuration>
<sourceRoot>${project.build.directory}/generated/cxf</sourceRoot>
<xsdOptions>
</xsdOptions>
<extensions> -->
<!--extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.version}</extension-->
<!-- <extension>org.apache.cxf.xjcplugins:cxf-xjc-ts:${cxf-xjc.version}</extension>
</extensions>
</configuration>
</execution>
</executions>
</plugin> -->
</plugins>
</build>
</project>
Expand Down
3 changes: 3 additions & 0 deletions model/model-client/src/compile/resources/catalog.xml
View file
Expand Up @@ -38,6 +38,9 @@
<public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/connector-schema-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/connector-schema-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2" uri="../../../target/midpoint-schema/xml/ns/public/resource/capabilities-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2" uri="../../../target/midpoint-schema/xml/ns/public/resource/capabilities-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../../../target/midpoint-schema/xml/ns/public/model/import/extension-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../../../target/midpoint-schema/xml/ns/public/model/import/extension-2.xsd" />

Expand Down
5 changes: 4 additions & 1 deletion model/model-client/src/main/resources/META-INF/catalog.xml
View file
Expand Up @@ -36,7 +36,10 @@
<system systemId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-2" uri="../xml/ns/public/connector/icf-1/resource-schema-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="../xml/ns/public/connector/icf-1/connector-schema-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="..xml/ns/public/connector/icf-1/connector-schema-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-2" uri="../xml/ns/public/connector/icf-1/connector-schema-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2" uri="../xml/ns/public/resource/capabilities-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-2" uri="../xml/ns/public/resource/capabilities-2.xsd" />

<public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-2.xsd" />
<system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-2" uri="../xml/ns/public/model/import/extension-2.xsd" />
Expand Down
18 changes: 18 additions & 0 deletions ...l-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
View file
Expand Up @@ -48,13 +48,15 @@
import com.evolveum.midpoint.xml.ns._public.common.common_2a.OperationResultType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.PasswordType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.ProtectedStringType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.RoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.SystemConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.UserType;
import com.evolveum.midpoint.xml.ns._public.common.fault_1_wsdl.FaultMessage;
import com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType;
import com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelService;
import com.evolveum.prism.xml.ns._public.query_2.PagingType;
import com.evolveum.prism.xml.ns._public.query_2.QueryType;
import com.evolveum.prism.xml.ns._public.types_2.ItemDeltaType;
import com.evolveum.prism.xml.ns._public.types_2.ModificationTypeType;
Expand Down Expand Up @@ -109,6 +111,10 @@ public static void main(String[] args) {
RoleType sailorRole = searchRoleByName(modelPort, "Sailor");
System.out.println("Got Sailor role");
System.out.println(sailorRole);

Collection<ResourceType> resouces = listResources(modelPort);
System.out.println("Resources");
System.out.println(resouces);

String userGuybrushoid = createUserGuybrush(modelPort, sailorRole);
System.out.println("Created user, OID: "+userGuybrushoid);
Expand Down Expand Up @@ -148,6 +154,18 @@ private static SystemConfigurationType getConfiguration(ModelPortType modelPort)

return (SystemConfigurationType) objectHolder.value;
}

private static Collection<ResourceType> listResources(ModelPortType modelPort) throws SAXException, IOException, FaultMessage {
OperationOptionsType options = new OperationOptionsType();
Holder<ObjectListType> objectListHolder = new Holder<ObjectListType>();
Holder<OperationResultType> resultHolder = new Holder<OperationResultType>();
PagingType paging = new PagingType();

modelPort.listObjects(getTypeUri(ResourceType.class), paging, options, objectListHolder, resultHolder);

ObjectListType objectList = objectListHolder.value;
return (Collection) objectList.getObject();
}

private static String createUserGuybrush(ModelPortType modelPort, RoleType role) throws FaultMessage {
Document doc = getDocumnent();
Expand Down
36 changes: 33 additions & 3 deletions testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
View file
Expand Up @@ -70,6 +70,7 @@
import com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType;
import com.evolveum.midpoint.xml.ns._public.resource.capabilities_2.ActivationCapabilityType;
import com.evolveum.midpoint.xml.ns._public.resource.capabilities_2.CredentialsCapabilityType;
import com.evolveum.prism.xml.ns._public.query_2.PagingType;
import com.evolveum.prism.xml.ns._public.query_2.QueryType;
import com.evolveum.prism.xml.ns._public.types_2.ItemDeltaType;
import com.evolveum.prism.xml.ns._public.types_2.ModificationTypeType;
Expand Down Expand Up @@ -694,9 +695,9 @@ public void test004Capabilities() throws ObjectNotFoundException, CommunicationE
* it is in the repository after the operation.
*/
@Test
public void test010AddUser() throws FileNotFoundException, JAXBException, FaultMessage,
ObjectNotFoundException, SchemaException, EncryptionException {
displayTestTile("test010AddUser");
public void test010AddUser() throws Exception {
final String TEST_NAME = "test010AddUser";
displayTestTile(TEST_NAME);

// GIVEN
checkRepoOpenDjResource();
Expand Down Expand Up @@ -3245,6 +3246,35 @@ public void timeout() {

checkAllShadows();
}

@Test
public void test400ListResources() throws Exception {
final String TEST_NAME = "test400ListResources";
displayTestTile(TEST_NAME);
// GIVEN
OperationResultType result = new OperationResultType();
Holder<OperationResultType> resultHolder = new Holder<OperationResultType>(result);

Holder<ObjectListType> objectListHolder = new Holder<ObjectListType>();
OperationOptionsType options = new OperationOptionsType();
PagingType paging = new PagingType();

// WHEN
modelWeb.listObjects(ObjectTypes.RESOURCE.getObjectTypeUri(), paging, options, objectListHolder , resultHolder);

// THEN

display("Resources", objectListHolder.value);
assertEquals("Unexpected number of resources", 3, objectListHolder.value.getObject().size());
// TODO

for(ObjectType object: objectListHolder.value.getObject()) {
// Marshalling may fail even though the Java object is OK so test for it
String xml = PrismTestUtil.marshalToString(object);
}

}



@Test
Expand Down

0 comments on commit 019b5af

Please sign in to comment.