Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
package org.eclipse.daanse.xmla.client.soapmessage;
package org.eclipse.daanse.xmla.client.soapmessage.integration;

import jakarta.xml.soap.SOAPMessage;
import jakarta.xml.ws.Provider;
Expand Down Expand Up @@ -118,6 +118,10 @@
import org.eclipse.daanse.xmla.api.discover.mdschema.properties.MdSchemaPropertiesResponseRow;
import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsRequest;
import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsResponseRow;
import org.eclipse.daanse.xmla.client.soapmessage.MockProvider;
import org.eclipse.daanse.xmla.client.soapmessage.Responses;
import org.eclipse.daanse.xmla.client.soapmessage.XMLUtil;
import org.eclipse.daanse.xmla.client.soapmessage.XmlaServiceClientImpl;
import org.eclipse.daanse.xmla.model.record.discover.PropertiesR;
import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRequestR;
import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRestrictionsR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
package org.eclipse.daanse.xmla.client.soapmessage;
package org.eclipse.daanse.xmla.client.soapmessage.integration;

import jakarta.xml.soap.SOAPMessage;
import jakarta.xml.ws.Provider;
Expand Down Expand Up @@ -58,6 +58,9 @@
import org.eclipse.daanse.xmla.api.xmla.ProactiveCaching;
import org.eclipse.daanse.xmla.api.xmla.Scope;
import org.eclipse.daanse.xmla.api.xmla_empty.Emptyresult;
import org.eclipse.daanse.xmla.client.soapmessage.MockProvider;
import org.eclipse.daanse.xmla.client.soapmessage.XMLUtil;
import org.eclipse.daanse.xmla.client.soapmessage.XmlaServiceClientImpl;
import org.eclipse.daanse.xmla.model.record.discover.PropertiesR;
import org.eclipse.daanse.xmla.model.record.execute.alter.AlterRequestR;
import org.eclipse.daanse.xmla.model.record.execute.cancel.CancelRequestR;
Expand Down
176 changes: 88 additions & 88 deletions client/soapmessage/test.bndrun.deactivated
Original file line number Diff line number Diff line change
Expand Up @@ -21,108 +21,108 @@
-runvm: ${def;argLine}

-runproperties: \
org.slf4j.simpleLogger.defaultLogLevel=debug,\
org.osgi.service.http.port=8090
org.slf4j.simpleLogger.defaultLogLevel=debug,\
org.osgi.service.http.port=8090


port : 17290
-runproperties.local.agent : osgi.fx.agent.port=0.0.0.0:${port}

-runrequires: \
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage',\
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage-tests',\
bnd.identity;id='com.sun.xml.ws.jaxws-rt',\
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
bnd.identity;id=junit-jupiter-engine,\
bnd.identity;id=junit-platform-launcher,\
bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
bnd.identity;id='org.apache.felix.scr',\
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.api'
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage',\
bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage-tests',\
bnd.identity;id='com.sun.xml.ws.jaxws-rt',\
bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
bnd.identity;id=junit-jupiter-engine,\
bnd.identity;id=junit-platform-launcher,\
bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
bnd.identity;id='org.apache.felix.scr',\
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\
bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.api'



-runee: JavaSE-21
-runee: JavaSE-25
#-runfw: org.apache.felix.framework
-runfw: org.eclipse.osgi

# This will help us keep -runbundles sorted
-runstartlevel: \
order=sortbynameversion,\
begin=-1
order=sortbynameversion,\
begin=-1
# The following is calculated by the bnd-resolver-maven-plugin

-runbundles: \
assertj-core;version='[3.26.0,3.26.1)',\
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
ch.qos.logback.core;version='[1.5.6,1.5.7)',\
com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\
com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\
com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\
com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\
com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\
com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\
jakarta.activation-api;version='[2.1.2,2.1.3)',\
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\
jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\
jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\
javax.activation-api;version='[1.2.0,1.2.1)',\
jaxb-api;version='[2.3.1,2.3.2)',\
junit-jupiter-api;version='[5.9.2,5.9.3)',\
junit-jupiter-engine;version='[5.9.2,5.9.3)',\
junit-jupiter-params;version='[5.9.2,5.9.3)',\
junit-platform-commons;version='[1.9.2,1.9.3)',\
junit-platform-engine;version='[1.9.2,1.9.3)',\
junit-platform-launcher;version='[1.9.2,1.9.3)',\
net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.jetty12.light;version='[1.0.2,1.0.3)',\
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
org.eclipse.daanse.jakarta.xml.ws.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.client.soapmessage;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.client.soapmessage-tests;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\
org.eclipse.jetty.alpn.server;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.ee10.servlet;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http2.common;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http2.hpack;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http2.server;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.io;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.jmx;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.security;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.server;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.session;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.util;version='[12.0.5,12.0.6)',\
org.glassfish.external.management-api;version='[3.2.3,3.2.4)',\
org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\
org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.jvnet.mimepull;version='[1.10.0,1.10.1)',\
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
org.osgi.test.common;version='[1.3.0,1.3.1)',\
org.osgi.test.junit5;version='[1.3.0,1.3.1)',\
org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\
org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\
slf4j.api;version='[2.0.12,2.0.13)',\
stax2-api;version='[4.2.2,4.2.3)'
assertj-core;version='[3.26.0,3.26.1)',\
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
ch.qos.logback.core;version='[1.5.6,1.5.7)',\
com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\
com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\
com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\
com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\
com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\
com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\
jakarta.activation-api;version='[2.1.2,2.1.3)',\
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\
jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\
jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\
javax.activation-api;version='[1.2.0,1.2.1)',\
jaxb-api;version='[2.3.1,2.3.2)',\
junit-jupiter-api;version='[5.9.2,5.9.3)',\
junit-jupiter-engine;version='[5.9.2,5.9.3)',\
junit-jupiter-params;version='[5.9.2,5.9.3)',\
junit-platform-commons;version='[1.9.2,1.9.3)',\
junit-platform-engine;version='[1.9.2,1.9.3)',\
junit-platform-launcher;version='[1.9.2,1.9.3)',\
net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.jetty12.light;version='[1.0.2,1.0.3)',\
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
org.eclipse.daanse.jakarta.xml.ws.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.client.soapmessage;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.client.soapmessage-tests;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\
org.eclipse.jetty.alpn.server;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.ee10.servlet;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http2.common;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http2.hpack;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.http2.server;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.io;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.jmx;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.security;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.server;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.session;version='[12.0.5,12.0.6)',\
org.eclipse.jetty.util;version='[12.0.5,12.0.6)',\
org.glassfish.external.management-api;version='[3.2.3,3.2.4)',\
org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\
org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\
org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
org.jvnet.mimepull;version='[1.10.0,1.10.1)',\
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
org.osgi.test.common;version='[1.3.0,1.3.1)',\
org.osgi.test.junit5;version='[1.3.0,1.3.1)',\
org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\
org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\
slf4j.api;version='[2.0.12,2.0.13)',\
stax2-api;version='[4.2.2,4.2.3)'
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.pom.parent</artifactId>
<version>0.0.3</version>
<version>0.0.5-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.daanse.xmla</artifactId>
<version>${revision}</version>
Expand Down Expand Up @@ -63,6 +63,20 @@
<xmlunit.version>2.10.0</xmlunit.version>
</properties>

<repositories>
<repository>
<id>ossrh</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://central.sonatype.com/repository/maven-snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<modules>
<module>api</module>
<module>model.record</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
package org.eclipse.daanse.xmla.server.jakarta.jws;
package org.eclipse.daanse.xmla.server.jakarta.jws.integration;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
Expand All @@ -28,6 +28,7 @@
import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.Row;
import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.Rowset;
import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.discover.DiscoverPropertiesResponseRowXml;
import org.eclipse.daanse.xmla.server.jakarta.jws.MsXmlAnalysisSoap;
import org.eclipse.daanse.xmla.server.tck.Constants;
import org.eclipse.daanse.xmla.server.tck.SOAPUtil;
import org.eclipse.daanse.xmla.server.tck.XMLUtil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
package org.eclipse.daanse.xmla.server.jakarta.jws;
package org.eclipse.daanse.xmla.server.jakarta.jws.integration;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
Expand Down
Loading
Loading