diff --git a/docker-compose.yml b/docker-compose.yml index 9f061ab57d93d2bc65f8998c0fca28a0fdcff2fb..0f558c8b3e7d396eea30a7d0eedb9d166d405e9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: toco-soap: build: dockerfile: Dockerfile + context: . ports: - - "8080:8080" + - "8080:8080" diff --git a/dockerfile b/dockerfile index 1577820e6bbe6823c080de8ba907ad83f98f4afd..4c570c25e41fcaa5e6e671647a2d962861c26f85 100644 --- a/dockerfile +++ b/dockerfile @@ -13,10 +13,8 @@ FROM amazoncorretto:8 COPY --from=build /app/target /app -COPY .env /app - WORKDIR /app EXPOSE 8080 -CMD java -jar toco_Soap-1.0-SNAPSHOT.jar \ No newline at end of file +CMD ["java", "-jar", "toco_Soap-1.0-SNAPSHOT.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 45e8028539d412855dcadb1a29a05c603f5ac158..df491a839822064cee6eb27fa8f47e6d598f71c1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,17 +15,6 @@ </properties> <dependencies> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.3.1</version> - </dependency> - <dependency> - <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> - <version>1.3.5</version> - </dependency> - <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> @@ -38,23 +27,11 @@ <version>1.18.20</version> <scope>provided</scope> </dependency> - <!-- javax jws--> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>javax.jws-api</artifactId> - <version>1.1</version> - </dependency> - <dependency> <groupId>org.glassfish.metro</groupId> <artifactId>webservices-api</artifactId> <version>4.0.2</version> </dependency> - <dependency> - <groupId>org.glassfish.metro</groupId> - <artifactId>webservices-rt</artifactId> - <version>2.3.1</version> - </dependency> </dependencies> @@ -68,11 +45,30 @@ <configuration> <archive> <manifest> + <addClasspath>true</addClasspath> <mainClass>org.toco.Main</mainClass> </manifest> </archive> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/src/main/java/org/toco/Main.java b/src/main/java/org/toco/Main.java index cee29a3b5834b677f37c6a9f2037e04ac8dbd539..ff3f6e82b3498b9af48555727a1e6a29fe2fa259 100644 --- a/src/main/java/org/toco/Main.java +++ b/src/main/java/org/toco/Main.java @@ -4,9 +4,11 @@ import org.toco.publisher.transactionPublisher; public class Main { public static void main(String[] args) { + System.out.println("server started"); gemsPublisher gemspublisher = new gemsPublisher(); gemspublisher.publish(); transactionPublisher transactionpublisher = new transactionPublisher(); transactionpublisher.publish(); + System.out.println("all services online"); } } \ No newline at end of file diff --git a/src/main/java/org/toco/publisher/gemsPublisher.java b/src/main/java/org/toco/publisher/gemsPublisher.java index b13e6f106d7ad141c537c92a9f4682003f75af76..987e44dd275a2c5397fd1ae49263b3fd94b57671 100644 --- a/src/main/java/org/toco/publisher/gemsPublisher.java +++ b/src/main/java/org/toco/publisher/gemsPublisher.java @@ -3,6 +3,8 @@ import javax.xml.ws.Endpoint; public class gemsPublisher { public static void publish() { + System.out.println("publishing gems service"); Endpoint.publish("http://localhost:8080/gems", new org.toco.service.userGems()); + System.out.println("gems service published"); } } diff --git a/src/main/java/org/toco/publisher/transactionPublisher.java b/src/main/java/org/toco/publisher/transactionPublisher.java index 1c6267f1ed3f7f3cbea23d2ba3abf8e45efe3b10..00c82709694fda0a39b90579e84e28e8c0f8260b 100644 --- a/src/main/java/org/toco/publisher/transactionPublisher.java +++ b/src/main/java/org/toco/publisher/transactionPublisher.java @@ -3,7 +3,13 @@ import javax.xml.ws.Endpoint; public class transactionPublisher { public static void publish() { + System.out.println("publishing transaction service"); Endpoint.publish("http://localhost:8080/transaction", new org.toco.service.transaction()); + System.out.println("transaction service published"); } } + + + +