Author: rmannibucau
Date: Mon Jun 12 18:33:55 2017
New Revision: 1798503
URL: http://svn.apache.org/viewvc?rev=1798503&view=rev
Log:
MEECROWAVE-40 basic jaxws support if user adds cxf jaxws
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/
openwebbeans/meecrowave/trunk/integration-tests/webservices/pom.xml
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract1.java
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract2.java
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint1.java
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint2.java
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/META-INF/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/META-INF/beans.xml
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/webservice/
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/webservice/JAXWSTest.java
openwebbeans/meecrowave/trunk/integration-tests/webservices/webservices.iml
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSAddressMapper.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSCdiExtension.java
Modified:
openwebbeans/meecrowave/trunk/integration-tests/pom.xml
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/CxfCdiAutoSetup.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
Modified: openwebbeans/meecrowave/trunk/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/pom.xml?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/integration-tests/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/integration-tests/pom.xml Mon Jun 12 18:33:55
2017
@@ -35,5 +35,6 @@
<modules>
<module>app-groovy</module>
<module>beanvalidation</module>
+ <module>webservices</module>
</modules>
</project>
Added: openwebbeans/meecrowave/trunk/integration-tests/webservices/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/pom.xml?rev=1798503&view=auto
==============================================================================
--- openwebbeans/meecrowave/trunk/integration-tests/webservices/pom.xml (added)
+++ openwebbeans/meecrowave/trunk/integration-tests/webservices/pom.xml Mon Jun
12 18:33:55 2017
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+ http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <artifactId>integration-tests</artifactId>
+ <groupId>org.apache.meecrowave</groupId>
+ <version>0.3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>webservices</artifactId>
+ <name>Meecrowave :: Integration Tests :: WebServices</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.meecrowave</groupId>
+ <artifactId>meecrowave-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.meecrowave</groupId>
+ <artifactId>meecrowave-junit</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract1.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract1.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract1.java
(added)
+++
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract1.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.tests.webservices;
+
+import javax.jws.WebService;
+
+@WebService
+public interface Contract1 {
+ String foo();
+}
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract2.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract2.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract2.java
(added)
+++
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Contract2.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.tests.webservices;
+
+import javax.jws.WebService;
+
+@WebService
+public interface Contract2 {
+ String bar();
+}
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint1.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint1.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint1.java
(added)
+++
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint1.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.tests.webservices;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.jws.WebService;
+
+@WebService
+@ApplicationScoped
+public class Endpoint1 implements Contract1 {
+ @Override
+ public String foo() {
+ return "foo";
+ }
+}
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint2.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint2.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint2.java
(added)
+++
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/java/org/apache/meecrowave/tests/webservices/Endpoint2.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.tests.webservices;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.jws.WebService;
+
+@WebService
+@ApplicationScoped
+public class Endpoint2 implements Contract2 {
+ @Override
+ public String bar() {
+ return "bar";
+ }
+}
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/META-INF/beans.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/META-INF/beans.xml?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/META-INF/beans.xml
(added)
+++
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/main/resources/META-INF/beans.xml
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans />
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/webservice/JAXWSTest.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/webservice/JAXWSTest.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/webservice/JAXWSTest.java
(added)
+++
openwebbeans/meecrowave/trunk/integration-tests/webservices/src/test/java/org/apache/meecrowave/tests/webservice/JAXWSTest.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.tests.webservice;
+
+import org.apache.meecrowave.Meecrowave;
+import org.apache.meecrowave.junit.MeecrowaveRule;
+import org.apache.meecrowave.tests.webservices.Contract1;
+import org.apache.meecrowave.tests.webservices.Contract2;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
+public class JAXWSTest {
+ @ClassRule
+ public static final MeecrowaveRule CONTAINER = new MeecrowaveRule(new
Meecrowave.Builder()
+ .randomHttpPort()
+ .includePackages(Contract1.class.getPackage().getName()), "");
+
+ @Test
+ public void run() throws MalformedURLException {
+ assertEquals("foo", Service.create(
+ new
URL(String.format("http://localhost:%d/webservices/Endpoint1?wsdl";,
CONTAINER.getConfiguration().getHttpPort())),
+ new QName("http://webservices.tests.meecrowave.apache.org/";,
"Endpoint1Service"))
+ .getPort(Contract1.class)
+ .foo());
+ assertEquals("bar", Service.create(
+ new
URL(String.format("http://localhost:%d/webservices/Endpoint2?wsdl";,
CONTAINER.getConfiguration().getHttpPort())),
+ new QName("http://webservices.tests.meecrowave.apache.org/";,
"Endpoint2Service"))
+ .getPort(Contract2.class)
+ .bar());
+ }
+}
Added:
openwebbeans/meecrowave/trunk/integration-tests/webservices/webservices.iml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/webservices/webservices.iml?rev=1798503&view=auto
==============================================================================
--- openwebbeans/meecrowave/trunk/integration-tests/webservices/webservices.iml
(added)
+++ openwebbeans/meecrowave/trunk/integration-tests/webservices/webservices.iml
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true"
type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java"
isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources"
type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java"
isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="meecrowave-core" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-annotation_1.2_spec:1.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jcdi_1.1_spec:1.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-atinject_1.0_spec:1.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-interceptor_1.2_spec:1.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-json_1.1_spec:1.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jsonb_1.0_spec:1.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jaxrs_2.0_spec:1.0-alpha-1" level="project"
/>
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-jaspic-api:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.commons:commons-lang3:3.5" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.xbean:xbean-reflect:4.5" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.openwebbeans:openwebbeans-impl:1.7.3" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.xbean:xbean-finder-shaded:4.5" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.xbean:xbean-asm5-shaded:4.5" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.openwebbeans:openwebbeans-spi:1.7.3" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.openwebbeans:openwebbeans-web:1.7.3" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.openwebbeans:openwebbeans-el22:1.7.3" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-catalina:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-servlet-api:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-juli:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-api:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-jni:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-coyote:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-util:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.tomcat:tomcat-util-scan:9.0.0.M21" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-transports-http:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-integration-cdi:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-rs-client:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.johnzon:johnzon-jaxrs:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.johnzon:johnzon-mapper:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.johnzon:johnzon-core:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.johnzon:johnzon-jsonb:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.logging.log4j:log4j-api:2.8.2" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.logging.log4j:log4j-core:2.8.2" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.logging.log4j:log4j-jul:2.8.2" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-frontend-jaxws:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2"
level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4"
level="project" />
+ <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.11"
level="project" />
+ <orderEntry type="library" name="Maven:
org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-bindings-soap:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.11"
level="project" />
+ <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-databinding-jaxb:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11"
level="project" />
+ <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-bindings-xml:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-frontend-simple:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-ws-addr:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.cxf:cxf-rt-ws-policy:3.1.11" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3"
level="project" />
+ <orderEntry type="module" module-name="meecrowave-junit" scope="TEST" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12"
level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven:
org.hamcrest:hamcrest-core:1.3" level="project" />
+ </component>
+</module>
\ No newline at end of file
Modified:
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
Mon Jun 12 18:33:55 2017
@@ -103,6 +103,7 @@ public class MeecrowaveConfiguration imp
private String tomcatAccessLogPattern;
private boolean jaxrsAutoActivateBeanValidation = true;
private String meecrowaveProperties = "meecrowave.properties";
+ private boolean jaxwsSupportIfAvailable = true;
// configurable cause when set to Local arquillian bypass some protocol
configuration cause of container default
private String arquillianProtocol = "Servlet 3.1";
@@ -757,4 +758,12 @@ public class MeecrowaveConfiguration imp
public void setMeecrowaveProperties(final String meecrowaveProperties) {
this.meecrowaveProperties = meecrowaveProperties;
}
+
+ public boolean isJaxwsSupportIfAvailable() {
+ return jaxwsSupportIfAvailable;
+ }
+
+ public void setJaxwsSupportIfAvailable(final boolean
jaxwsSupportIfAvailable) {
+ this.jaxwsSupportIfAvailable = jaxwsSupportIfAvailable;
+ }
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
Mon Jun 12 18:33:55 2017
@@ -1037,6 +1037,9 @@ public class Meecrowave implements AutoC
description = "Loads a meecrowave properties, defaults to
meecrowave.properties.")
private String meecrowaveProperties = "meecrowave.properties";
+ @CliOption(name = "jaxws-support-if-present", description = "Should
@WebService CDI beans be deployed if cxf-rt-frontend-jaxws is in the
classpath.")
+ private boolean jaxwsSupportIfAvailable = true;
+
private final Map<Class<?>, Object> extensions = new HashMap<>();
private final Collection<Consumer<Tomcat>> instanceCustomizers = new
ArrayList<>();
@@ -1059,6 +1062,14 @@ public class Meecrowave implements AutoC
}));
}
+ public boolean isJaxwsSupportIfAvailable() {
+ return jaxwsSupportIfAvailable;
+ }
+
+ public void setJaxwsSupportIfAvailable(final boolean
jaxwsSupportIfAvailable) {
+ this.jaxwsSupportIfAvailable = jaxwsSupportIfAvailable;
+ }
+
public int getWatcherBouncing() {
return watcherBouncing;
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/CxfCdiAutoSetup.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/CxfCdiAutoSetup.java?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/CxfCdiAutoSetup.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/CxfCdiAutoSetup.java
Mon Jun 12 18:33:55 2017
@@ -29,6 +29,7 @@ import org.apache.cxf.jaxrs.model.Operat
import org.apache.cxf.jaxrs.model.ProviderInfo;
import org.apache.cxf.jaxrs.provider.ProviderFactory;
import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
+import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.ChainInitiationObserver;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.servlet.ServletDestination;
@@ -324,78 +325,82 @@ public class CxfCdiAutoSetup implements
final Endpoint endpoint =
ChainInitiationObserver.class.cast(sd.getMessageObserver()).getEndpoint();
final ApplicationInfo app =
ApplicationInfo.class.cast(endpoint.get(Application.class.getName()));
final JAXRSServiceFactoryBean sfb =
JAXRSServiceFactoryBean.class.cast(endpoint.get(JAXRSServiceFactoryBean.class.getName()));
- if (sfb == null) {
- return null;
- }
-
- final List<Logs.LogResourceEndpointInfo>
resourcesToLog = new ArrayList<>();
- int classSize = 0;
- int addressSize = 0;
-
final String base = sd.getEndpointInfo().getAddress();
- final List<ClassResourceInfo> resources =
sfb.getClassResourceInfo();
- for (final ClassResourceInfo info : resources) {
- if (info.getResourceClass() == null) { // possible?
- continue;
- }
- final String address = Logs.singleSlash(base,
info.getURITemplate().getValue());
+ if (sfb != null) {
+ final List<Logs.LogResourceEndpointInfo>
resourcesToLog = new ArrayList<>();
+ int classSize = 0;
+ int addressSize = 0;
+
+ final List<ClassResourceInfo> resources =
sfb.getClassResourceInfo();
+ for (final ClassResourceInfo info : resources) {
+ if (info.getResourceClass() == null) { //
possible?
+ continue;
+ }
- final String clazz =
uproxyName(info.getResourceClass().getName());
- classSize = Math.max(classSize, clazz.length());
- addressSize = Math.max(addressSize,
address.length());
-
- int methodSize = 7;
- int methodStrSize = 0;
-
- final List<Logs.LogOperationEndpointInfo> toLog =
new ArrayList<>();
-
- final MethodDispatcher md =
info.getMethodDispatcher();
- for (final OperationResourceInfo ori :
md.getOperationResourceInfos()) {
- final String httpMethod = ori.getHttpMethod();
- final String currentAddress =
Logs.singleSlash(address, ori.getURITemplate().getValue());
- final String methodToStr =
Logs.toSimpleString(ori.getMethodToInvoke());
- toLog.add(new
Logs.LogOperationEndpointInfo(httpMethod, currentAddress, methodToStr));
+ final String address = Logs.singleSlash(base,
info.getURITemplate().getValue());
- if (httpMethod != null) {
- methodSize = Math.max(methodSize,
httpMethod.length());
+ final String clazz =
uproxyName(info.getResourceClass().getName());
+ classSize = Math.max(classSize,
clazz.length());
+ addressSize = Math.max(addressSize,
address.length());
+
+ int methodSize = 7;
+ int methodStrSize = 0;
+
+ final List<Logs.LogOperationEndpointInfo>
toLog = new ArrayList<>();
+
+ final MethodDispatcher md =
info.getMethodDispatcher();
+ for (final OperationResourceInfo ori :
md.getOperationResourceInfos()) {
+ final String httpMethod =
ori.getHttpMethod();
+ final String currentAddress =
Logs.singleSlash(address, ori.getURITemplate().getValue());
+ final String methodToStr =
Logs.toSimpleString(ori.getMethodToInvoke());
+ toLog.add(new
Logs.LogOperationEndpointInfo(httpMethod, currentAddress, methodToStr));
+
+ if (httpMethod != null) {
+ methodSize = Math.max(methodSize,
httpMethod.length());
+ }
+ addressSize = Math.max(addressSize,
currentAddress.length());
+ methodStrSize = Math.max(methodStrSize,
methodToStr.length());
}
- addressSize = Math.max(addressSize,
currentAddress.length());
- methodStrSize = Math.max(methodStrSize,
methodToStr.length());
- }
- Collections.sort(toLog);
+ Collections.sort(toLog);
- resourcesToLog.add(new
Logs.LogResourceEndpointInfo(address, clazz, toLog, methodSize, methodStrSize));
- }
+ resourcesToLog.add(new
Logs.LogResourceEndpointInfo(address, clazz, toLog, methodSize, methodStrSize));
+ }
- // effective logging
- log.info("REST Application: " +
endpoint.getEndpointInfo().getAddress() + " -> "
- +
ofNullable(app).map(ApplicationInfo::getResourceClass).map(Class::getName).map(CxfCdiAutoSetup::uproxyName).orElse(""));
-
- Collections.sort(resourcesToLog);
- final int fClassSize = classSize;
- final int fAddressSize = addressSize;
- resourcesToLog.forEach(resource -> {
- log.info(" Service URI: "
- + Logs.forceLength(resource.address,
fAddressSize, true) + " -> "
- + Logs.forceLength(resource.classname,
fClassSize, true));
-
- resource.operations.forEach(info -> {
- log.info(" "
- + Logs.forceLength(info.http,
resource.methodSize, false) + " "
- + Logs.forceLength(info.address,
fAddressSize, true) + " -> "
- + Logs.forceLength(info.method,
resource.methodStrSize, true));
+ // effective logging
+ log.info("REST Application: " +
endpoint.getEndpointInfo().getAddress() + " -> "
+ +
ofNullable(app).map(ApplicationInfo::getResourceClass).map(Class::getName).map(CxfCdiAutoSetup::uproxyName).orElse(""));
+
+ Collections.sort(resourcesToLog);
+ final int fClassSize = classSize;
+ final int fAddressSize = addressSize;
+ resourcesToLog.forEach(resource -> {
+ log.info(" Service URI: "
+ + Logs.forceLength(resource.address,
fAddressSize, true) + " -> "
+ + Logs.forceLength(resource.classname,
fClassSize, true));
+
+ resource.operations.forEach(info -> {
+ log.info(" "
+ + Logs.forceLength(info.http,
resource.methodSize, false) + " "
+ + Logs.forceLength(info.address,
fAddressSize, true) + " -> "
+ + Logs.forceLength(info.method,
resource.methodStrSize, true));
+ });
+ resource.operations.clear();
});
- resource.operations.clear();
- });
- resourcesToLog.clear();
-
- // log @Providers
- if
(Meecrowave.Builder.class.cast(sc.getServletContext().getAttribute("meecrowave.configuration")).isJaxrsLogProviders())
{
- final ServerProviderFactory spf =
ServerProviderFactory.class.cast(endpoint.get(ServerProviderFactory.class.getName()));
- dump(log, spf, "MessageBodyReaders",
"messageReaders");
- dump(log, spf, "MessageBodyWriters",
"messageWriters");
+ resourcesToLog.clear();
+
+ // log @Providers
+ if
(Meecrowave.Builder.class.cast(sc.getServletContext().getAttribute("meecrowave.configuration")).isJaxrsLogProviders())
{
+ final ServerProviderFactory spf =
ServerProviderFactory.class.cast(endpoint.get(ServerProviderFactory.class.getName()));
+ dump(log, spf, "MessageBodyReaders",
"messageReaders");
+ dump(log, spf, "MessageBodyWriters",
"messageWriters");
+ }
+ } else {
+ final EndpointInfo endpointInfo =
endpoint.getEndpointInfo();
+ if (endpointInfo.getName() != null) {
+ log.info("@WebService > " +
endpointInfo.getName().toString() + " -> " + base);
+ }
}
return base;
Added:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSAddressMapper.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSAddressMapper.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSAddressMapper.java
(added)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSAddressMapper.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.cxf;
+
+public interface JAXWSAddressMapper {
+ String map(Class<?> type);
+}
Added:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSCdiExtension.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSCdiExtension.java?rev=1798503&view=auto
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSCdiExtension.java
(added)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/JAXWSCdiExtension.java
Mon Jun 12 18:33:55 2017
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.meecrowave.cxf;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.AbstractEndpointFactory;
+import org.apache.meecrowave.Meecrowave;
+import org.apache.meecrowave.logging.tomcat.LogFacade;
+import org.apache.webbeans.component.OwbBean;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeShutdown;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.jws.WebService;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+// bus is handled by JAXRSCdiResourceExtension
+//
+// todo: support WebServiceProvider, maybe clients?
+public class JAXWSCdiExtension implements Extension {
+ private boolean active;
+
+ private final List<Bean<?>> serviceBeans = new ArrayList<>();
+ private final Collection<Runnable> preShutdownTasks = new ArrayList<>();
+
+ public JAXWSCdiExtension() {
+ try {
+ final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+ loader.loadClass("org.apache.cxf.jaxws.JaxWsServerFactoryBean");
+ loader.loadClass("org.apache.cxf.service.model.SchemaInfo");
+ active = true;
+ } catch (final NoClassDefFoundError | ClassNotFoundException e) {
+ active = false;
+ }
+ }
+
+ public <T> void collect(@Observes final ProcessBean<T> processBean) {
+ if (active &&
processBean.getAnnotated().isAnnotationPresent(WebService.class)) {
+ serviceBeans.add(processBean.getBean());
+ }
+ }
+
+ public void load(@Observes final AfterDeploymentValidation
afterDeploymentValidation, final BeanManager beanManager) {
+ if (!active || serviceBeans.isEmpty() ||
+
!Meecrowave.Builder.class.cast(beanManager.getReference(beanManager.resolve(beanManager.getBeans(Meecrowave.Builder.class)),
Meecrowave.Builder.class, null))
+ .isJaxwsSupportIfAvailable()) {
+ return;
+ }
+
+ final Bean<?> busBean =
beanManager.resolve(beanManager.getBeans("cxf"));
+ final Bus bus = Bus.class.cast(beanManager.getReference(busBean,
Bus.class, beanManager.createCreationalContext(busBean)));
+
+ final Bean<?> mapperBean =
beanManager.resolve(beanManager.getBeans(JAXWSAddressMapper.class));
+ final JAXWSAddressMapper mapper;
+ if (mapperBean == null) {
+ mapper = type -> "/webservices/" + type.getSimpleName();
+ } else {
+ mapper =
JAXWSAddressMapper.class.cast(beanManager.getReference(mapperBean,
JAXWSAddressMapper.class, beanManager.createCreationalContext(mapperBean)));
+ }
+
+ serviceBeans.forEach(bean -> {
+ final Class<?> beanClass = OwbBean.class.isInstance(bean) ?
OwbBean.class.cast(bean).getReturnType() : bean.getBeanClass();
+
+ final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+ try {
+ final AbstractEndpointFactory aef =
AbstractEndpointFactory.class.cast(loader.loadClass("org.apache.cxf.jaxws.JaxWsServerFactoryBean").getConstructor().newInstance());
+ aef.setBus(bus);
+ aef.setAddress(mapper.map(beanClass));
+
+ final Class<? extends AbstractEndpointFactory> factoryClass =
aef.getClass();
+ factoryClass.getMethod("setStart", boolean.class).invoke(aef,
true);
+ factoryClass.getMethod("setServiceClass",
Class.class).invoke(aef, beanClass);
+
+ final CreationalContext<Object> creationalContext =
beanManager.createCreationalContext(null);
+ if (!beanManager.isNormalScope(bean.getScope())) {
+ preShutdownTasks.add(creationalContext::release);
+ }
+ factoryClass.getMethod("setServiceBean",
Object.class).invoke(aef, beanManager.getReference(bean, Object.class,
creationalContext));
+
+ final Object server =
factoryClass.getMethod("create").invoke(aef);
+
+ final Class<?> serverClass = server.getClass();
+ serverClass.getMethod("start").invoke(server);
+ preShutdownTasks.add(() -> {
+ try {
+ serverClass.getMethod("destroy").invoke(server);
+ } catch (final NoClassDefFoundError |
NoSuchMethodException | IllegalAccessException e) {
+ throw new IllegalStateException(e);
+ } catch (final InvocationTargetException e) {
+ throw new IllegalStateException(e.getCause());
+ }
+ });
+ } catch (final NoClassDefFoundError | ClassNotFoundException |
NoSuchMethodException | IllegalAccessException | InstantiationException e) {
+ throw new IllegalStateException(e);
+ } catch (final InvocationTargetException e) {
+ throw new IllegalStateException(e.getCause());
+ }
+ });
+ serviceBeans.clear();
+ }
+
+ public void release(@Observes final BeforeShutdown beforeShutdown) {
+ preShutdownTasks.stream().map(r -> (Runnable) () -> {
+ try {
+ r.run();
+ } catch (final RuntimeException re) {
+ new
LogFacade(JAXWSCdiExtension.class.getName()).warn(re.getMessage(), re);
+ }
+ }).forEach(Runnable::run);
+ preShutdownTasks.clear();
+ }
+}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Mon Jun 12 18:33:55 2017
@@ -1 +1,2 @@
org.apache.meecrowave.openwebbeans.MeecrowaveExtension
+org.apache.meecrowave.cxf.JAXWSCdiExtension
Modified:
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
Mon Jun 12 18:33:55 2017
@@ -94,6 +94,15 @@ public class MeecrowaveExtension {
private String tomcatAccessLogPattern;
private boolean jaxrsAutoActivateBeanValidation = true;
private String meecrowaveProperties = "meecrowave.properties";
+ private boolean jaxwsSupportIfAvailable = true;
+
+ public boolean isJaxwsSupportIfAvailable() {
+ return jaxwsSupportIfAvailable;
+ }
+
+ public void setJaxwsSupportIfAvailable(final boolean
jaxwsSupportIfAvailable) {
+ this.jaxwsSupportIfAvailable = jaxwsSupportIfAvailable;
+ }
public String getMeecrowaveProperties() {
return meecrowaveProperties;
Modified:
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
Mon Jun 12 18:33:55 2017
@@ -336,6 +336,10 @@ public class MeecrowaveTask extends Defa
@Optional
private String meecrowaveProperties = "meecrowave.properties";
+ @Input
+ @Optional
+ private boolean jaxwsSupportIfAvailable = true;
+
@TaskAction
public void bake() {
fixConfig();
@@ -1160,4 +1164,12 @@ public class MeecrowaveTask extends Defa
public void setWatcherBouncing(final int watcherBouncing) {
this.watcherBouncing = watcherBouncing;
}
+
+ public boolean isJaxwsSupportIfAvailable() {
+ return jaxwsSupportIfAvailable;
+ }
+
+ public void setJaxwsSupportIfAvailable(final boolean
jaxwsSupportIfAvailable) {
+ this.jaxwsSupportIfAvailable = jaxwsSupportIfAvailable;
+ }
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java?rev=1798503&r1=1798502&r2=1798503&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
Mon Jun 12 18:33:55 2017
@@ -281,6 +281,9 @@ public class MeecrowaveRunMojo extends A
@Parameter(property = "meecrowave.meecrowave-properties", defaultValue =
"meecrowave.properties")
private String meecrowaveProperties;
+ @Parameter(property = "meecrowave.jaxws-support", defaultValue = "true")
+ private boolean jaxwsSupportIfAvailable;
+
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (skip) {
