Skip to content

[JBTM-3027] changing dependencies from lra-annotations to lra eclipse ones #227

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 31, 2018
Merged

[JBTM-3027] changing dependencies from lra-annotations to lra eclipse ones #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ wildfly-10.x.zip
wildfly-10.*/
wildfly-10.*.jar
apache-tomcat-*
narayana-full-*-bin.zip
narayana-full-*
jboss*/
bin/
db/
9 changes: 5 additions & 4 deletions rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions rts/lra/flight-service/src/main/java/io/narayana/rts/lra/demo/flight/FlightService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions rts/lra/hotel-service/src/main/java/io/narayana/rts/lra/demo/hotel/HotelParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions rts/lra/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=$!
Expand Down Expand Up @@ -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
rm -rf $NARAYANA_INSTALL_LOCATION
7 changes: 5 additions & 2 deletions ...trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion ...ra/trip-controller/src/main/java/io/narayana/rts/lra/demo/tripcontroller/TripService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
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;
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.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
Expand Down
18 changes: 0 additions & 18 deletions scripts/hudson/quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down