Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename package to org.kiwiproject.dropwizard.jakarta.xml.ws (API change) #75

Merged
merged 1 commit into from
Nov 12, 2023
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ To run the example service:

```bash
java -jar \
dropwizard-jaxws-example/target/dropwizard-jakarta-xml-ws-example-[version].jar \
server dropwizard-jaxws-example/config.yaml
dropwizard-jakarta-xml-ws-example/target/dropwizard-jakarta-xml-ws-example-[version].jar \
server dropwizard-jakarta-xml-ws-example/config.yaml
```

Notes
Expand Down
2 changes: 1 addition & 1 deletion dropwizard-jakarta-xml-ws-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.roskart.dropwizard.jaxws.example.JaxWsExampleApplication</mainClass>
<mainClass>org.kiwiproject.dropwizard.jakarta.xml.ws.example.JaxWsExampleApplication</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/cxf/bus-extensions.txt</resource>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
package com.roskart.dropwizard.jaxws.example;

import com.roskart.dropwizard.jaxws.BasicAuthentication;
import com.roskart.dropwizard.jaxws.ClientBuilder;
import com.roskart.dropwizard.jaxws.EndpointBuilder;
import com.roskart.dropwizard.jaxws.JAXWSBundle;
import com.roskart.dropwizard.jaxws.example.auth.BasicAuthenticator;
import com.roskart.dropwizard.jaxws.example.core.Person;
import com.roskart.dropwizard.jaxws.example.db.PersonDAO;
import com.roskart.dropwizard.jaxws.example.resources.AccessMtomServiceResource;
import com.roskart.dropwizard.jaxws.example.resources.AccessProtectedServiceResource;
import com.roskart.dropwizard.jaxws.example.resources.AccessWsdlFirstServiceResource;
import com.roskart.dropwizard.jaxws.example.resources.WsdlFirstClientHandler;
import com.roskart.dropwizard.jaxws.example.ws.HibernateExampleService;
import com.roskart.dropwizard.jaxws.example.ws.JavaFirstService;
import com.roskart.dropwizard.jaxws.example.ws.JavaFirstServiceImpl;
import com.roskart.dropwizard.jaxws.example.ws.MtomServiceImpl;
import com.roskart.dropwizard.jaxws.example.ws.SimpleService;
import com.roskart.dropwizard.jaxws.example.ws.WsdlFirstServiceImpl;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example;

import io.dropwizard.core.Application;
import io.dropwizard.core.setup.Bootstrap;
import io.dropwizard.core.setup.Environment;
Expand All @@ -25,10 +8,27 @@
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
import org.kiwiproject.dropwizard.jakarta.xml.ws.BasicAuthentication;
import org.kiwiproject.dropwizard.jakarta.xml.ws.ClientBuilder;
import org.kiwiproject.dropwizard.jakarta.xml.ws.EndpointBuilder;
import org.kiwiproject.dropwizard.jakarta.xml.ws.JAXWSBundle;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.auth.BasicAuthenticator;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.db.PersonDAO;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.AccessMtomServiceResource;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.AccessProtectedServiceResource;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.AccessWsdlFirstServiceResource;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.WsdlFirstClientHandler;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.HibernateExampleService;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstService;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstServiceImpl;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.MtomServiceImpl;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.SimpleService;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.WsdlFirstServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService;

public class JaxWsExampleApplication extends Application<JaxWsExampleApplicationConfiguration> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.roskart.dropwizard.jaxws.example;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.dropwizard.core.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.roskart.dropwizard.jaxws.example.auth;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.auth;

import com.roskart.dropwizard.jaxws.example.core.User;
import io.dropwizard.auth.Authenticator;
import io.dropwizard.auth.basic.BasicCredentials;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.User;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This class is copied from dropwizard-example
*/
package com.roskart.dropwizard.jaxws.example.core;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.core;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand All @@ -18,11 +18,11 @@
@Entity
@Table(name = "people")
@NamedQuery(
name = "com.roskart.dropwizard.jaxws.example.core.Person.findAll",
name = "org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person.findAll",
query = "SELECT p FROM Person p"
)
@NamedQuery(
name = "com.roskart.dropwizard.jaxws.example.core.Person.findById",
name = "org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person.findById",
query = "SELECT p FROM Person p WHERE p.id = :id"
)
public class Person {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.roskart.dropwizard.jaxws.auth;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.core;

import java.security.Principal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.roskart.dropwizard.jaxws.example.db;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.db;

import com.roskart.dropwizard.jaxws.example.core.Person;
import io.dropwizard.hibernate.AbstractDAO;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.query.Query;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person;

import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -42,7 +42,7 @@ public Person create(Person person) {
public List<Person> findAll() {
@SuppressWarnings("unchecked")
Query<Person> query =
(Query<Person>) namedQuery("com.roskart.dropwizard.jaxws.example.core.Person.findAll");
(Query<Person>) namedQuery("org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person.findAll");
return list(query);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.roskart.dropwizard.jaxws.example.resources;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;

import com.codahale.metrics.annotation.Timed;
import jakarta.activation.DataHandler;
Expand All @@ -8,10 +8,10 @@
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.apache.cxf.helpers.IOUtils;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.Hello;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.HelloResponse;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.ObjectFactory;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.Hello;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.HelloResponse;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.ObjectFactory;

import java.io.IOException;
import java.io.UncheckedIOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.roskart.dropwizard.jaxws.example.resources;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;

import com.roskart.dropwizard.jaxws.example.ws.JavaFirstService;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
import jakarta.xml.ws.BindingProvider;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstService;

/**
* A Dropwizard resource that invokes JavaFirstService SOAP web service using basic authentication.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.roskart.dropwizard.jaxws.example.resources;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;

import com.codahale.metrics.annotation.Timed;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.Echo;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.EchoResponse;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.ObjectFactory;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.Echo;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.EchoResponse;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.ObjectFactory;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService;

/**
* A Dropwizard resource that invokes WsdlFirstService SOAP web service.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.roskart.dropwizard.jaxws.example.resources;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;

import com.roskart.dropwizard.jaxws.example.util.SimpleLoggingSoapHandler;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.util.SimpleLoggingSoapHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.roskart.dropwizard.jaxws.example.util;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.util;

import jakarta.xml.ws.handler.MessageContext;
import jakarta.xml.ws.handler.soap.SOAPHandler;
import jakarta.xml.ws.handler.soap.SOAPMessageContext;
import org.slf4j.Logger;

import java.util.Set;
import javax.xml.namespace.QName;
import java.util.Set;

public abstract class SimpleLoggingSoapHandler implements SOAPHandler<SOAPMessageContext> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import com.roskart.dropwizard.jaxws.example.core.Person;
import com.roskart.dropwizard.jaxws.example.db.PersonDAO;
import io.dropwizard.hibernate.UnitOfWork;
import jakarta.jws.WebMethod;
import jakarta.jws.WebService;
import jakarta.validation.Valid;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.db.PersonDAO;

import java.util.List;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import jakarta.jws.WebMethod;
import jakarta.jws.WebParam;
import jakarta.jws.WebResult;
import jakarta.jws.WebService;
import jakarta.xml.ws.WebFault;

@WebService(targetNamespace = "http://com.roskart.dropwizard.example/JavaFirstService")
@WebService(targetNamespace = "http://org.kiwiproject.dropwizard.example/JavaFirstService")
public interface JavaFirstService {

@WebFault(name = "JavaFirstServiceException")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import com.codahale.metrics.annotation.ExceptionMetered;
import com.codahale.metrics.annotation.Metered;
Expand All @@ -11,8 +11,8 @@
@WebService(name = "JavaFirstService",
serviceName = "JavaFirstService",
portName = "JavaFirstService",
targetNamespace = "http://com.roskart.dropwizard.example/JavaFirstService",
endpointInterface = "com.roskart.dropwizard.jaxws.example.ws.JavaFirstService")
targetNamespace = "http://org.kiwiproject.dropwizard.example/JavaFirstService",
endpointInterface = "org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstService")
public class JavaFirstServiceImpl implements JavaFirstService {

@Resource
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import com.codahale.metrics.annotation.Metered;
import jakarta.activation.DataHandler;
import jakarta.jws.WebService;
import jakarta.mail.util.ByteArrayDataSource;
import jakarta.xml.ws.soap.MTOM;
import org.apache.cxf.helpers.IOUtils;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.Hello;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.HelloResponse;
import ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.Hello;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.HelloResponse;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService;

import java.io.IOException;
import java.io.UncheckedIOException;

@MTOM // @MTOM annotation is not necessary if you invoke enableMtom on EndpointBuilder
@WebService(endpointInterface = "ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService",
targetNamespace = "http://com.roskart.dropwizard.jaxws.example.ws/MtomService",
@WebService(endpointInterface = "ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService",
targetNamespace = "http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService",
name = "MtomService",
wsdlLocation = "META-INF/MtomService.wsdl")
public class MtomServiceImpl implements MtomService {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import com.codahale.metrics.annotation.Metered;
import jakarta.jws.WebMethod;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import com.roskart.dropwizard.jaxws.example.util.SimpleLoggingSoapHandler;
import org.kiwiproject.dropwizard.jakarta.xml.ws.example.util.SimpleLoggingSoapHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.roskart.dropwizard.jaxws.example.ws;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;

import com.codahale.metrics.annotation.Metered;
import jakarta.jws.HandlerChain;
import jakarta.jws.WebService;
import jakarta.xml.ws.AsyncHandler;
import org.apache.cxf.annotations.UseAsyncMethod;
import org.apache.cxf.jaxws.ServerAsyncResponse;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.Echo;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.EchoResponse;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.NonBlockingEcho;
import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.Echo;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.EchoResponse;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.NonBlockingEcho;
import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService;

import java.util.concurrent.Future;

@WebService(endpointInterface = "ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService",
targetNamespace = "http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService",
@WebService(endpointInterface = "ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService",
targetNamespace = "http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService",
name = "WsdlFirstService",
wsdlLocation = "META-INF/WsdlFirstService.wsdl")
@HandlerChain(file = "wsdlfirstservice-handlerchain.xml")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<wsdl:definitions
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://com.roskart.dropwizard.jaxws.example.ws/MtomService"
xmlns:tns="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
name="MtomService"
targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/MtomService">
targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService">

<wsdl:types>
<xsd:schema targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/MtomService">
<xsd:schema targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService">

<xsd:element name="Hello" type="tns:Hello">
</xsd:element>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<wsdl:definitions
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService"
<wsdl:definitions
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
name="WsdlFirstService"
targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService">
targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService">

<wsdl:types>
<xsd:schema targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService">
<xsd:schema targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService">

<xsd:element name="Echo" type="tns:Echo">
</xsd:element>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
<jws:handler-chain>
<jws:handler>
<jws:handler-class>com.roskart.dropwizard.jaxws.example.ws.WsdlFirstServiceHandler</jws:handler-class>
<jws:handler-class>org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.WsdlFirstServiceHandler
</jws:handler-class>
</jws:handler>
</jws:handler-chain>
</jws:handler-chains>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.roskart.dropwizard.jaxws.example.resources;
package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;

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