From 2dedd165ca4e32be1cb28154f1984082e9943efe Mon Sep 17 00:00:00 2001 From: Ondra Chaloupka Date: Wed, 23 May 2018 17:07:36 +0200 Subject: [PATCH] [JBTM-3027] changing dependencies from lra-annotations to lra eclipse ones --- .gitignore | 2 +- .../rts/lra/demo/flight/FlightParticipant.java | 9 +++++---- .../rts/lra/demo/flight/FlightService.java | 5 +++-- .../rts/lra/demo/hotel/HotelParticipant.java | 7 ++++--- rts/lra/run.sh | 7 +++++-- .../demo/tripcontroller/TripController.java | 7 +++++-- .../lra/demo/tripcontroller/TripService.java | 4 +++- scripts/hudson/quickstart.sh | 18 ------------------ 8 files changed, 26 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index df371dcb25..e132ee68ca 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ wildfly-10.x.zip wildfly-10.*/ wildfly-10.*.jar apache-tomcat-* -narayana-full-*-bin.zip +narayana-full-* jboss*/ bin/ db/ diff --git a/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightParticipant.java b/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightParticipant.java index dd167a8c30..1f090b1c03 100755 --- a/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightParticipant.java +++ b/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightParticipant.java @@ -22,10 +22,6 @@ package io.narayana.rts.lra.demo.flight; import com.fasterxml.jackson.core.JsonProcessingException; -import io.narayana.lra.annotation.Compensate; -import io.narayana.lra.annotation.Complete; -import io.narayana.lra.annotation.LRA; -import io.narayana.lra.annotation.NestedLRA; import io.narayana.rts.lra.demo.model.Booking; import javax.enterprise.context.RequestScoped; @@ -44,6 +40,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.eclipse.microprofile.lra.annotation.Compensate; +import org.eclipse.microprofile.lra.annotation.Complete; +import org.eclipse.microprofile.lra.annotation.LRA; +import org.eclipse.microprofile.lra.annotation.NestedLRA; + import java.util.Collection; import static io.narayana.lra.client.NarayanaLRAClient.LRA_HTTP_HEADER; diff --git a/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightService.java b/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightService.java index d9eb5f862d..4aa37e0817 100755 --- a/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightService.java +++ b/rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightService.java @@ -22,16 +22,17 @@ package io.narayana.rts.lra.demo.flight; import io.narayana.lra.client.NarayanaLRAClient; -import io.narayana.lra.client.LRAClient; import io.narayana.rts.lra.demo.model.Booking; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; + +import org.eclipse.microprofile.lra.client.LRAClient; + import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; @ApplicationScoped diff --git a/rts/lra/hotel-service/src/main/java/io/narayana/rts/lra/demo/hotel/HotelParticipant.java b/rts/lra/hotel-service/src/main/java/io/narayana/rts/lra/demo/hotel/HotelParticipant.java index e1b5ea020e..7cb5175dff 100755 --- a/rts/lra/hotel-service/src/main/java/io/narayana/rts/lra/demo/hotel/HotelParticipant.java +++ b/rts/lra/hotel-service/src/main/java/io/narayana/rts/lra/demo/hotel/HotelParticipant.java @@ -22,9 +22,6 @@ package io.narayana.rts.lra.demo.hotel; import com.fasterxml.jackson.core.JsonProcessingException; -import io.narayana.lra.annotation.Compensate; -import io.narayana.lra.annotation.Complete; -import io.narayana.lra.annotation.LRA; import io.narayana.rts.lra.demo.model.Booking; import javax.enterprise.context.RequestScoped; @@ -42,6 +39,10 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.eclipse.microprofile.lra.annotation.Compensate; +import org.eclipse.microprofile.lra.annotation.Complete; +import org.eclipse.microprofile.lra.annotation.LRA; + import java.util.Collection; import static io.narayana.lra.client.NarayanaLRAClient.LRA_HTTP_HEADER; diff --git a/rts/lra/run.sh b/rts/lra/run.sh index 320d999832..f18c40f5a8 100755 --- a/rts/lra/run.sh +++ b/rts/lra/run.sh @@ -31,7 +31,10 @@ case "$(uname)" in esac rm -rf $NARAYANA_INSTALL_LOCATION -unzip $WORKSPACE/narayana-full-5.8.3.Final-SNAPSHOT-bin.zip +NARAYANA_ZIP="narayana-full-5.8.3.Final-SNAPSHOT-bin.zip" +[ ! -f "$WORKSPACE/$NARAYANA_ZIP" ] &&\ + echo "There is no Narayana zip at \$WORKSPACE directory at '$WORKSPACE/$NARAYANA_ZIP" && exit 1 +unzip "$WORKSPACE/$NARAYANA_ZIP" java $(getDebugArgs $PORT) -jar $NARAYANA_INSTALL_LOCATION/rts/lra/lra-coordinator-swarm.jar -Dswarm.http.port=8080 -Dswarm.transactions.object-store-path=../lra-coordinator-logs & ID1=$! @@ -72,4 +75,4 @@ echo "" [ $DEBUG ] && echo "Processes are still running ($ID1 $ID2 $ID3 $ID4 $ID5) press any key to end them" && read kill -9 $ID1 $ID2 $ID3 $ID4 $ID5 -rm -rf $NARAYANA_INSTALL_LOCATION \ No newline at end of file +rm -rf $NARAYANA_INSTALL_LOCATION diff --git a/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripController.java b/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripController.java index 2ea3324ebb..6833ce7716 100755 --- a/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripController.java +++ b/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripController.java @@ -22,9 +22,8 @@ package io.narayana.rts.lra.demo.tripcontroller; import com.fasterxml.jackson.core.JsonProcessingException; -import io.narayana.lra.annotation.LRA; + import io.narayana.lra.client.NarayanaLRAClient; -import io.narayana.lra.client.LRAClient; import io.narayana.rts.lra.demo.model.Booking; import javax.annotation.PostConstruct; @@ -51,6 +50,10 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; + +import org.eclipse.microprofile.lra.annotation.LRA; +import org.eclipse.microprofile.lra.client.LRAClient; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; diff --git a/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripService.java b/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripService.java index eb14c54ab6..de5111f8f0 100755 --- a/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripService.java +++ b/rts/lra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripService.java @@ -22,7 +22,6 @@ package io.narayana.rts.lra.demo.tripcontroller; import com.fasterxml.jackson.databind.ObjectMapper; -import io.narayana.lra.client.LRAClient; import io.narayana.rts.lra.demo.model.Booking; import javax.ws.rs.client.WebTarget; @@ -30,6 +29,9 @@ import javax.inject.Inject; import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; + +import org.eclipse.microprofile.lra.client.LRAClient; + import java.io.IOException; import java.net.MalformedURLException; import java.net.URISyntaxException; diff --git a/scripts/hudson/quickstart.sh b/scripts/hudson/quickstart.sh index a6b42be913..6c9d91fa33 100755 --- a/scripts/hudson/quickstart.sh +++ b/scripts/hudson/quickstart.sh @@ -25,7 +25,6 @@ function fatal { NARAYANA_REPO=${NARAYANA_REPO:-jbosstm} NARAYANA_BRANCH="${NARAYANA_BRANCH:-master}" QUICKSTART_NARAYANA_VERSION=${QUICKSTART_NARAYANA_VERSION:-5.8.3.Final-SNAPSHOT} -MICROPROFILE_LRA_BRANCH=${MICROPROFILE_LRA_BRANCH:-microprofile-lra-v2} function comment_on_pull { @@ -83,22 +82,6 @@ function get_bt_dependencies { fi } -# ensure the microprofile-lra artifact is in the local maven repository -function build_microprofile_lra { - if [ -d microprofile-lra ]; then - rm -rf microprofile-lra - fi - - git clone https://github.com/jbosstm/microprofile-lra - [ $? = 0 ] || fatal "git clone https://github.com/jbosstm/microprofile-lra failed" - cd microprofile-lra/ - git checkout $MICROPROFILE_LRA_BRANCH - [ $? = 0 ] || fatal "git checkout $MICROPROFILE_LRA_BRANCH failed" - cd .. - ./build.sh -f microprofile-lra/pom.xml -B clean install - [ $? = 0 ] || fatal "Build of microprofile-lra failed" -} - function build_narayana { cd $WORKSPACE # INITIALIZE ENV @@ -124,7 +107,6 @@ function build_narayana { exit -1 fi cd narayana - build_microprofile_lra ./build.sh clean install -B -DskipTests -Pcommunity ./build.sh -f blacktie/wildfly-blacktie/pom.xml clean install -B ./build.sh -f blacktie/pom.xml clean install -B -DskipTests