diff --git a/.editorconfig b/.editorconfig index 64beafe..fe6bdcd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -37,3 +37,11 @@ insert_final_newline = unset trim_trailing_whitespace = unset indent_style = unset indent_size = unset + +[.flattened-pom.xml] +charset = unset +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +indent_style = unset +indent_size = unset diff --git a/client/soapmessage/pom.xml b/client/soapmessage/pom.xml index e9e9cca..6905b46 100644 --- a/client/soapmessage/pom.xml +++ b/client/soapmessage/pom.xml @@ -48,14 +48,6 @@ compile - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.api - ${revision} - compile - - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar - ${revision} - runtime - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.handler - ${revision} - runtime - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard - ${revision} - runtime - + + + + + + + + + + + + + + + + + + org.xmlunit diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java index 5429f5b..f554979 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java @@ -15,7 +15,7 @@ import jakarta.xml.soap.SOAPMessage; import jakarta.xml.ws.Provider; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; import org.eclipse.daanse.xmla.api.RequestMetaData; import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.common.enums.AccessEnum; @@ -179,7 +179,7 @@ import org.mockito.ArgumentCaptor; import org.osgi.framework.BundleContext; import org.osgi.service.component.annotations.RequireServiceComponentRuntime; -import org.osgi.service.servlet.whiteboard.annotations.RequireHttpWhiteboard; +//import org.osgi.service.servlet.whiteboard.annotations.RequireHttpWhiteboard; import org.osgi.test.common.annotation.InjectBundleContext; import org.osgi.test.common.annotation.Property; import org.osgi.test.common.annotation.config.WithFactoryConfiguration; @@ -217,12 +217,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RequireSoapWhiteboard +//@RequireSoapWhiteboard @ExtendWith(ConfigurationExtension.class) @WithFactoryConfiguration(factoryPid = "org.eclipse.daanse.jakarta.xml.ws.handler.SOAPLoggingHandler", name = "test-ms-config", location = "?", properties = { @Property(key = "osgi.soap.endpoint.selector", value = "(service.pid=*)") }) @RequireServiceComponentRuntime -@RequireHttpWhiteboard +//@RequireHttpWhiteboard class ClientDiscoverTest { XmlaServiceClientImpl client = new XmlaServiceClientImpl("http://localhost:8090/xmla"); // Register a Provider using whiteboardpattern and xmlassert to check xml diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java index a2de243..d98ba0b 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java @@ -15,7 +15,7 @@ import jakarta.xml.soap.SOAPMessage; import jakarta.xml.ws.Provider; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; import org.eclipse.daanse.xmla.api.RequestMetaData; import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.common.properties.AxisFormat; @@ -105,7 +105,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RequireSoapWhiteboard +//@RequireSoapWhiteboard @ExtendWith(ConfigurationExtension.class) @WithFactoryConfiguration(factoryPid = "org.eclipse.daanse.jakarta.xml.ws.handler.SOAPLoggingHandler", name = "test-ms-config", location = "?", properties = { @Property(key = "osgi.soap.endpoint.selector", value = "(service.pid=*)") }) diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/MockProvider.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/MockProvider.java index 7a2339d..b0dd8bb 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/MockProvider.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/MockProvider.java @@ -21,7 +21,7 @@ import jakarta.xml.soap.SOAPBody; import jakarta.xml.soap.SOAPEnvelope; import jakarta.xml.soap.SOAPPart; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; @@ -40,7 +40,7 @@ @WebServiceProvider() @ServiceMode(value = Service.Mode.MESSAGE) -@RequireSoapWhiteboard +//@RequireSoapWhiteboard public class MockProvider implements Provider { String response; diff --git a/client/soapmessage/test.bndrun b/client/soapmessage/test.bndrun.deactivated similarity index 99% rename from client/soapmessage/test.bndrun rename to client/soapmessage/test.bndrun.deactivated index 446dca9..0114c59 100644 --- a/client/soapmessage/test.bndrun +++ b/client/soapmessage/test.bndrun.deactivated @@ -125,4 +125,4 @@ port : 17290 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)' \ No newline at end of file + stax2-api;version='[4.2.2,4.2.3)' diff --git a/server/adapter.soapmessage/pom.xml b/server/adapter.soapmessage/pom.xml index 8dce373..8b296c1 100644 --- a/server/adapter.soapmessage/pom.xml +++ b/server/adapter.soapmessage/pom.xml @@ -46,11 +46,7 @@ org.osgi org.osgi.service.servlet - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.api - ${revision} - + - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar - ${revision} - runtime - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.handler - ${revision} - runtime - + + + + + + + + + + + + com.sun.xml.ws jaxws-rt test - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard - ${revision} - runtime - jakarta.servlet diff --git a/server/jakarta.jws/pom.xml b/server/jakarta.jws/pom.xml index 2270c47..deea67b 100644 --- a/server/jakarta.jws/pom.xml +++ b/server/jakarta.jws/pom.xml @@ -61,18 +61,21 @@ org.osgi.service.servlet - org.eclipse.daanse - org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla - ${revision} - compile + org.osgi + org.osgi.service.component + + + org.osgi + org.osgi.service.metatype.annotations org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.api + org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla ${revision} compile + - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar - ${revision} - runtime - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.handler - ${revision} - runtime - + + + + + + + + + + + + com.sun.xml.ws jaxws-rt test - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard - ${revision} - runtime - jakarta.servlet jakarta.servlet-api diff --git a/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoap.java b/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoap.java index 5fa02f1..b11b2dd 100644 --- a/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoap.java +++ b/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoap.java @@ -13,8 +13,8 @@ */ package org.eclipse.daanse.xmla.server.jakarta.jws; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.prototypes.SOAPWhiteboardEndpoint; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.prototypes.SOAPWhiteboardEndpoint; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.model.jakarta.xml.bind.ext.Authenticate; import org.eclipse.daanse.xmla.model.jakarta.xml.bind.ext.AuthenticateResponse; @@ -63,9 +63,9 @@ org.eclipse.daanse.xmla.model.jakarta.xml.bind.engine100_100.ObjectFactory.class, org.eclipse.daanse.xmla.model.jakarta.xml.bind.engine200_200.ObjectFactory.class }) @Component(service = MsXmlAnalysisSoap.class, name = MsXmlAnalysisSoap.PID) -@RequireSoapWhiteboard +//@RequireSoapWhiteboard @Designate(factory = true, ocd = MsXmlAnalysisSoap.Config.class) -@SOAPWhiteboardEndpoint(contextpath = "/xmla") +//@SOAPWhiteboardEndpoint(contextpath = "/xmla") public class MsXmlAnalysisSoap { public static final String PID="org.eclipse.daanse.xmla.server.jakarta.jws.MsXmlAnalysisSoap"; diff --git a/server/jakarta.jws/test.bndrun b/server/jakarta.jws/test.bndrun.deactivated similarity index 99% rename from server/jakarta.jws/test.bndrun rename to server/jakarta.jws/test.bndrun.deactivated index 8d63667..5c8fe60 100644 --- a/server/jakarta.jws/test.bndrun +++ b/server/jakarta.jws/test.bndrun.deactivated @@ -22,7 +22,7 @@ -runproperties: \ org.slf4j.simpleLogger.defaultLogLevel=debug,\ org.osgi.service.http.port=8090 - + @@ -37,9 +37,9 @@ org.slf4j.simpleLogger.defaultLogLevel=debug,\ 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.xmla.server.tck' - - + + -runee: JavaSE-21 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi @@ -124,4 +124,4 @@ org.slf4j.simpleLogger.defaultLogLevel=debug,\ 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)' \ No newline at end of file + stax2-api;version='[4.2.2,4.2.3)' diff --git a/server/jakarta.xml.ws.provider.soapmessage/pom.xml b/server/jakarta.xml.ws.provider.soapmessage/pom.xml index f697db2..9ae2b55 100644 --- a/server/jakarta.xml.ws.provider.soapmessage/pom.xml +++ b/server/jakarta.xml.ws.provider.soapmessage/pom.xml @@ -55,11 +55,15 @@ org.osgi.service.servlet - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.api - ${revision} + org.osgi + org.osgi.service.component + + + org.osgi + org.osgi.service.metatype.annotations + - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar - ${revision} - runtime - - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.handler - ${revision} - runtime - + + + + + + + + + + + + + com.sun.xml.ws jaxws-rt test - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard - ${revision} - runtime - org.eclipse.daanse org.eclipse.daanse.xmla.server.tck diff --git a/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java b/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java index fe4d538..8f9639a 100644 --- a/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java +++ b/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java @@ -25,8 +25,8 @@ import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.WebServiceProvider; import jakarta.xml.ws.handler.MessageContext; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; -import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.prototypes.SOAPWhiteboardEndpoint; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; +//import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.prototypes.SOAPWhiteboardEndpoint; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.server.adapter.soapmessage.XmlaApiAdapter; import org.osgi.service.component.annotations.Activate; @@ -42,10 +42,10 @@ @WebServiceProvider() @ServiceMode(value = Service.Mode.MESSAGE) -@RequireSoapWhiteboard +//@RequireSoapWhiteboard @Component(service = Provider.class) @Designate(factory = true, ocd = XmlaWebserviceProvider.Config.class) -@SOAPWhiteboardEndpoint(contextpath = "xmla") +//@SOAPWhiteboardEndpoint(contextpath = "xmla") public class XmlaWebserviceProvider implements Provider { private static final Logger LOGGER = LoggerFactory.getLogger(XmlaWebserviceProvider.class); private static final String USER_AGENT = "User-agent"; diff --git a/server/jakarta.xml.ws.provider.soapmessage/test.bndrun b/server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated similarity index 92% rename from server/jakarta.xml.ws.provider.soapmessage/test.bndrun rename to server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated index 45a0efd..efa5a7f 100644 --- a/server/jakarta.xml.ws.provider.soapmessage/test.bndrun +++ b/server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated @@ -24,7 +24,7 @@ -runproperties: \ 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} @@ -37,12 +37,10 @@ port : 17290 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.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\ - bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\ bnd.identity;id='org.eclipse.daanse.xmla.server.tck' - - + + -runee: JavaSE-21 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi @@ -87,9 +85,6 @@ port : 17290 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.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.model.record;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.xmla.server.adapter.soapmessage;version='[0.0.1,0.0.2)',\ @@ -126,4 +121,4 @@ port : 17290 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)' \ No newline at end of file + stax2-api;version='[4.2.2,4.2.3)' diff --git a/server/jdk.httpserver/test.bndrun b/server/jdk.httpserver/test.bndrun index bbc45b8..3388328 100644 --- a/server/jdk.httpserver/test.bndrun +++ b/server/jdk.httpserver/test.bndrun @@ -81,7 +81,6 @@ port : 17290 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.cm;version='[1.6.1,1.6.2)',\ 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)',\ diff --git a/server/tck/pom.xml b/server/tck/pom.xml index 83c5777..618f2fa 100644 --- a/server/tck/pom.xml +++ b/server/tck/pom.xml @@ -48,13 +48,6 @@ org.osgi.service.servlet - - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.api - ${revision} - compile - - org.osgi org.osgi.service.component.annotations