added report data source to the build

Evolveum · Mar 13, 2015 · 6c7438f · 6c7438f
1 parent fd32056
commit 6c7438f
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 168 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl b/infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
@@ -31,8 +31,9 @@
 
     <types>
         <xsd:schema targetNamespace="http://midpoint.evolveum.com/xml/ns/private/fake/fake-1-report.wsdl">
-            <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-3" 
+           <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-3" 
             			schemaLocation="../../public/common/common-3.xsd"/>
+
             <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" 
             			schemaLocation="../../public/resource/capabilities-3.xsd"/>
             <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" 
@@ -55,6 +56,11 @@
             <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/types-3" 
             			schemaLocation="http://prism.evolveum.com/xml/ns/public/types-3"/>
 
+
+
+            <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/gui/admin-1"
+                        schemaLocation="../../public/gui/admin-1.xsd"/>
+
 
         </xsd:schema>
     </types>

diff --git a/model/pom.xml b/model/pom.xml
@@ -59,6 +59,6 @@
         <module>notifications-impl</module>
         <module>report-api</module>
         <module>report-impl</module>
-<!--         <module>report-ds-impl</module> -->
+        <module>report-ds-impl</module>
     </modules>
 </project>
diff --git a/model/report-ds-impl/pom.xml b/model/report-ds-impl/pom.xml
diff --git a/model/report-ds-impl/src/compile/resources/catalog.xml b/model/report-ds-impl/src/compile/resources/catalog.xml
@@ -27,6 +27,9 @@
 
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/common-3" uri="../../../target/midpoint-schema/xml/ns/public/common/common-3.xsd" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/common-3" uri="../../../target/midpoint-schema/xml/ns/public/common/common-3.xsd" />
+
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../../../target/midpoint-schema/xml/ns/public/common/api-types-3.xsd" />
+    <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../../../target/midpoint-schema/xml/ns/public/common/api-types-3.xsd" />
 
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/resource-schema-3.xsd" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/resource-schema-3.xsd" />
@@ -40,8 +43,8 @@
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-3" uri="../../../target/midpoint-schema/xml/ns/public/model/import/extension-3.xsd" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/import/extension-3" uri="../../../target/midpoint-schema/xml/ns/public/model/import/extension-3.xsd" />
 
-    <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
-    <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../../../target/midpoint-schema/xml/ns/public/model/scripting/scripting-3.xsd" />
+    <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../../../target/midpoint-schema/xml/ns/public/model/scripting/scripting-3.xsd" />
 
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" uri="../xml/ns/public/model/scripting/extension-3.xsd" />
@@ -51,14 +54,16 @@
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/workflow-1.xsd" uri="../../../target/midpoint-schema/xml/ns/public/model/workflow-1.xsd" />
     -->
 
+    <!-- Model WSDL location -->
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../../../target/midpoint-schema/xml/ns/public/model/model-3.wsdl" />
+    <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../../../target/midpoint-schema/xml/ns/public/model/model-3.wsdl" />
+
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../xml/ns/public/report/report-3.wsdl" />
+    <system systemId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../xml/ns/public/report/report-3.wsdl" />
+
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/fault-3" uri="../../../target/midpoint-schema/xml/ns/public/common/fault-3.wsdl" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/fault-3" uri="../../../target/midpoint-schema/xml/ns/public/common/fault-3.wsdl" />
 
-	<!-- Report WSDL location -->
-    <public publicId="http://midpoint.evolveum.com/xml/ns/public/report/model-3" uri="../../../target/midpoint-schema/xml/ns/public/report/report-3.wsdl" />
-    <system systemId="http://midpoint.evolveum.com/xml/ns/public/report/model-3" uri="../../../target/midpoint-schema/xml/ns/public/report/report-3.wsdl" />
-
-
     <!-- Bundled standard schemas -->
     <public publicId="datatypes" uri="../../../target/midpoint-schema/xml/ns/standard/datatypes.dtd" />
     <system systemId="datatypes" uri="../../../target/midpoint-schema/xml/ns/standard/datatypes.dtd" />

diff --git a/model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml b/model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
@@ -18,12 +18,12 @@
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../../../target/midpoint-schema/xml/ns/public/model/model-3.wsdl" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../../../target/midpoint-schema/xml/ns/public/model/model-3.wsdl" />
 
-    <public publicId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../../../target/midpoint-schema/xml/ns/public/report/report-3.wsdl" />
-    <system systemId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../../../target/midpoint-schema/xml/ns/public/report/report-3.wsdl" />
-
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/fault-3" uri="../../../target/midpoint-schema/xml/ns/public/common/fault-3.wsdl" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/fault-3" uri="../../../target/midpoint-schema/xml/ns/public/common/fault-3.wsdl" />
 
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../../../target/midpoint-schema/xml/ns/public/report/report-3.wsdl" />
+    <system systemId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../../../target/midpoint-schema/xml/ns/public/report/report-3.wsdl" />
+
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../../../target/midpoint-schema/xml/ns/public/common/api-types-3.xsd" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../../../target/midpoint-schema/xml/ns/public/common/api-types-3.xsd" />
 

diff --git a/...report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java b/...report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
@@ -13,6 +13,7 @@
 
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.Item;
+import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismContainer;
 import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.PrismObject;
@@ -40,7 +41,7 @@ public MidPointDataSource(Collection<PrismObject<? extends ObjectType>> results)
 	public MidPointDataSource(ObjectListType results){
 		resultList = new ArrayList<>();
 		for (ObjectType objType : results.getObject()){
-			resultList.add(objType.asPrismObject());
+			resultList.add(((Objectable)objType).asPrismObject());
 		}
 		iterator = resultList.iterator();
 	}

diff --git a/...ort-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java b/...ort-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.xml.namespace.QName;
@@ -13,47 +12,19 @@
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRParameter;
 import net.sf.jasperreports.engine.JRValueParameter;
-import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.JasperReportsContext;
 import net.sf.jasperreports.engine.base.JRBaseParameter;
-import net.sf.jasperreports.engine.data.JRBeanArrayDataSource;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 import net.sf.jasperreports.engine.fill.JRFillParameter;
 import net.sf.jasperreports.engine.query.JRAbstractQueryExecuter;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.evolveum.midpoint.audit.api.AuditService;
-import com.evolveum.midpoint.model.api.ModelService;
-import com.evolveum.midpoint.model.api.expr.MidpointFunctions;
-import com.evolveum.midpoint.model.common.expression.ExpressionFactory;
-import com.evolveum.midpoint.model.common.expression.ExpressionUtil;
-import com.evolveum.midpoint.model.common.expression.ExpressionVariables;
-import com.evolveum.midpoint.model.common.expression.functions.FunctionLibrary;
-import com.evolveum.midpoint.model.common.expression.script.jsr223.Jsr223ScriptEvaluator;
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismPropertyDefinition;
 import com.evolveum.midpoint.prism.PrismPropertyValue;
-import com.evolveum.midpoint.prism.PrismReferenceDefinition;
-import com.evolveum.midpoint.prism.parser.QueryConvertor;
-import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.prism.query.InOidFilter;
-import com.evolveum.midpoint.prism.query.LogicalFilter;
-import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.prism.query.PropertyValueFilter;
-import com.evolveum.midpoint.prism.query.TypeFilter;
 import com.evolveum.midpoint.report.api.ReportService;
-import com.evolveum.midpoint.report.impl.ReportFunctions;
-import com.evolveum.midpoint.report.impl.ReportUtils;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.util.ObjectResolver;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.task.api.TaskManager;
-import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.CommunicationException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
@@ -62,10 +33,7 @@
 import com.evolveum.midpoint.util.exception.SecurityViolationException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
-import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 
 public class MidPointQueryExecutor extends JRAbstractQueryExecuter{
 

diff --git a/...-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java b/...-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
@@ -16,27 +16,17 @@
 import net.sf.jasperreports.engine.base.JRBaseParameter;
 import net.sf.jasperreports.engine.query.JRAbstractQueryExecuter;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 
-import com.evolveum.midpoint.audit.api.AuditService;
-import com.evolveum.midpoint.model.api.ModelService;
-import com.evolveum.midpoint.model.api.expr.MidpointFunctions;
-import com.evolveum.midpoint.model.common.expression.ExpressionFactory;
-import com.evolveum.midpoint.model.common.expression.ExpressionVariables;
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.query.InOidFilter;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
-import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.query.PropertyValueFilter;
-import com.evolveum.midpoint.schema.constants.SchemaConstants;
-import com.evolveum.midpoint.schema.util.ObjectResolver;
-import com.evolveum.midpoint.task.api.TaskManager;
+import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.api_types_3.GetOperationOptionsType;
@@ -47,7 +37,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ParamsType;
 import com.evolveum.midpoint.xml.ns._public.report.report_3.ReportPortType;
 import com.evolveum.midpoint.xml.ns._public.report.report_3.ReportService;
-import com.evolveum.prism.xml.ns._public.query_3.QueryType;
 
 public class MidPointRemoteQueryExecutor extends JRAbstractQueryExecuter{
 
@@ -204,7 +193,7 @@ private ParamsType getParameters(){
 				Serializable v = (Serializable) getParameterValue(param.getName());
 				EntryType entry = new EntryType();
 				entry.setKey(param.getName());
-				entry.setEntryValue(new JAXBElement<Serializable>(SchemaConstants.C_PARAM_VALUE, Serializable.class, v));
+				entry.setEntryValue(new JAXBElement<Serializable>(SchemaConstantsGenerated.C_PARAM_VALUE, Serializable.class, v));
 				parameters.getEntry().add(entry);
 				LOGGER.trace("p.val: {}", v);
 			} catch (Exception e){

diff --git a/model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml b/model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml
@@ -17,20 +17,20 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
 
     <!-- Report WSDL location -->
+<!--     <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../xml/ns/public/model/model-3.wsdl" /> -->
+<!--     <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/model-3" uri="../xml/ns/public/model/model-3.wsdl" /> -->
+
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../xml/ns/public/report/report-3.wsdl" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/report/report-3" uri="../xml/ns/public/report/report-3.wsdl" />
 
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/fault-3" uri="../xml/ns/public/common/fault-3.wsdl" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/fault-3" uri="../xml/ns/public/common/fault-3.wsdl" />
-    
+
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../xml/ns/public/common/api-types-3.xsd" />
     <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" uri="../xml/ns/public/common/api-types-3.xsd" />
 
-	<public publicId="http://midpoint.evolveum.com/xml/ns/public/common/common-3" uri="../xml/ns/public/common/common-3.xsd" />
-    <system systemId="http://midpoint.evolveum.com/xml/ns/public/common/common-3" uri="../xml/ns/public/common/common-3.xsd" />
-
-    <!--    <rewriteSystem systemIdStartString="http://midpoint.evolveum.com/xml/" rewritePrefix="main/resources/xml/"/>
-<rewriteSystem systemIdStartString="http://prism.evolveum.com/xml/" rewritePrefix="../prism/main/resources/xml/"/>  -->
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
+    <system systemId="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3" uri="../xml/ns/public/model/scripting/scripting-3.xsd" />
 
-    <nextCatalog catalog="catalog-runtime.xml"/>
+    <nextCatalog catalog="catalog.xml"/>
 </catalog>