build without daanse.xml.ws use osgi spec later

.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

client/soapmessage/pom.xml

@@ -48,39 +48,31 @@
       <scope>compile</scope>
     </dependency>
 
-
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.api</artifactId>
-      <version>${revision}</version>
-      <scope>compile</scope>
-    </dependency>
-
     <!--
     Using the dependency scope allows to distinguish projects which contribute
     execution data but should not become part of the report:
     compile , runtime , provided : Project source and execution data is included in
     the report.
     test : Only execution data is considered for the report.
     -->
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>org.xmlunit</groupId>

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

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=*)") })

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<SOAPMessage> {
     String response;
 

client/soapmessage/test.bndrun → 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)'
+	stax2-api;version='[4.2.2,4.2.3)'

server/adapter.soapmessage/pom.xml

@@ -46,11 +46,7 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.servlet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.api</artifactId>
-      <version>${revision}</version>
-    </dependency>
+
 
     <!--
 Using the dependency scope allows to distinguish projects which contribute
@@ -59,29 +55,23 @@ Using the dependency scope allows to distinguish projects which contribute
     the report.
     test : Only execution data is considered for the report.
     -->
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-rt</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
 
     <dependency>
       <groupId>jakarta.servlet</groupId>

server/jakarta.jws/pom.xml

@@ -61,48 +61,45 @@
       <artifactId>org.osgi.service.servlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla</artifactId>
-      <version>${revision}</version>
-      <scope>compile</scope>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.api</artifactId>
+      <artifactId>org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla</artifactId>
       <version>${revision}</version>
       <scope>compile</scope>
     </dependency>
 
+
     <!--
 Using the dependency scope allows to distinguish projects which contribute
     execution data but should not become part of the report:
     compile , runtime , provided : Project source and execution data is included in
     the report.
     test : Only execution data is considered for the report.
     -->
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-rt</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>

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";

server/jakarta.jws/test.bndrun → 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)'
+	stax2-api;version='[4.2.2,4.2.3)'

server/jakarta.xml.ws.provider.soapmessage/pom.xml

@@ -55,41 +55,40 @@
       <artifactId>org.osgi.service.servlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.api</artifactId>
-      <version>${revision}</version>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
     </dependency>
 
+
     <!--
   Using the dependency scope allows to distinguish projects which contribute
     execution data but should not become part of the report:
       compile , runtime , provided : Project source and execution data is included in
     the report.
       test : Only execution data is considered for the report.
     -->
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>org.eclipse.daanse</groupId>-->
+<!--      <artifactId>org.eclipse.daanse.jakarta.xml.ws.handler</artifactId>-->
+<!--      <version>${revision}</version>-->
+<!--      <scope>runtime</scope>-->
+<!--    </dependency>-->
+
     <dependency>
       <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-rt</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard</artifactId>
-      <version>${revision}</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.daanse</groupId>
       <artifactId>org.eclipse.daanse.xmla.server.tck</artifactId>