saga ws fixes

travelbooking/createDBLinksAndOsagaInfra.sh

@@ -83,7 +83,7 @@ echo ____________________________________________________
 echo setting up DB links and OSaga infrastructure ...
 cd osaga-java-api
 mvn clean install
-#nohup java -jar
-java -jar target/osaga-java-api.jar | grep -v "WARNING"
+cp osaga-java-api.jar target/
+java -jar target/osaga-java-api.jar
 cd ../
 

travelbooking/osaga-java-api/src/main/java/AQSaga/AQjmsSagaMessageListener.java

@@ -80,6 +80,9 @@ public final void onMessage(Message message) {
                     case 5: // OSAGA_RESPONSE
                         response(sagaId, payload);
                         break;
+                    case 8: // OSAGA_RESPONSE
+                        response(sagaId, payload);
+                        break;
                 }
             }
             this.session.commit();

travelbooking/osaga-java-api/src/main/java/AQSaga/util/CreateDBLinksAndSagaInfra.java

@@ -38,12 +38,16 @@ private static void uploadWalletAndCreateDBLink(String tnsAdmin, String localUse
                                                     String linkName, String linkhostname, String linkport,
                                                     String linkservice_name, String linkssl_server_cert_dn,
                                                     boolean isCoordinator) throws Exception {
+        boolean skipdblinks = System.getenv("skipdblinks") != null && System.getenv("skipdblinks").equals("true");
+        boolean skipinstallSaga = System.getenv("skipinstallSaga") != null && System.getenv("skipinstallSaga").equals("true");
+        boolean skipbrokerinstall = System.getenv("skipbrokerinstall") != null && System.getenv("skipbrokerinstall").equals("true");
         System.out.println(
-                "tnsAdmin = " + tnsAdmin + "\nlocalUser = " + localUser + "\nlocalPW = " + localPW +
+                "tnsAdmin = " + tnsAdmin + "\nlocalUser = " + localUser +
                         "\nurl = " + url + "\ncredName = " + credName +
-                        "\nremoteUser = " + remoteUser + "\nremotePW = " + remotePW +
+                        "\nremoteUser = " + remoteUser +
                         "\nlinkName = " + linkName + "\nlinkhostname = " + linkhostname + "\nlinkport = " + linkport +
-                        "\nlinkservice_name = " + linkservice_name + "\nlinkssl_server_cert_dn = " + linkssl_server_cert_dn);
+                        "\nlinkservice_name = " + linkservice_name + "\nlinkssl_server_cert_dn = " + linkssl_server_cert_dn
+        );
         System.setProperty("oracle.jdbc.fanEnabled", "false");
         PoolDataSource poolDataSource = PoolDataSourceFactory.getPoolDataSource();
         poolDataSource.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
@@ -52,19 +56,21 @@ private static void uploadWalletAndCreateDBLink(String tnsAdmin, String localUse
         poolDataSource.setPassword(localPW);
         Connection conn = poolDataSource.getConnection();
         System.out.println("Connection:" + conn + " url:" + url);
-        createDBLink(tnsAdmin, url, credName, remoteUser, remotePW, linkName, linkhostname, linkport, linkservice_name, linkssl_server_cert_dn, conn);
-        installSaga(conn, url);
+        if (!skipdblinks)
+            createDBLink(tnsAdmin, url, credName, remoteUser, remotePW, linkName, linkhostname, linkport, linkservice_name, linkssl_server_cert_dn, conn);
+        if (!skipinstallSaga)
+            installSaga(conn, url);
         if (isCoordinator) {
             System.out.println("Creating wrappers...");
             conn.prepareStatement(OsagaInfra.createBEGINSAGAWRAPPER).execute();
             conn.prepareStatement(OsagaInfra.createEnrollParticipant).execute();
             System.out.println("Finished creating wrappers.");
             System.out.println("Creating broker...");
-            conn.prepareStatement("{call dbms_saga_adm.add_broker(broker_name => 'TEST')}").execute();
+            if (!skipbrokerinstall) conn.prepareStatement("{call dbms_saga_adm.add_broker(broker_name => 'TEST')}").execute();
             System.out.println("Finished creating broker.");
             System.out.println("Creating coordinator...");
             //Note that if the coordinator is co-located with the broker, dblink_to_broker should be NULL
-            conn.prepareStatement("{dbms_saga_adm.add_coordinator( " +
+            conn.prepareStatement("{call dbms_saga_adm.add_coordinator( " +
                     "coordinator_name => 'TravelCoordinator',  " +
                     "dblink_to_broker => null,   " +
                     "mailbox_schema => 'admin',  " +
@@ -95,7 +101,13 @@ private static void createDBLink(String tnsAdmin, String url, String credName, S
         preparedStatement.setString(1, credName);
         preparedStatement.setString(2, remoteUser);
         preparedStatement.setString(3, remotePW);
-        preparedStatement.execute();
+        try {
+            preparedStatement.execute();
+        } catch (SQLException sqlex) {
+            if (sqlex.getMessage().contains("already exists")) {
+                System.out.println("Credential for dblink already exists, proceeding... ");
+            }
+        }
         System.out.println("credName created = " + credName + " from url = " + url );
 
         preparedStatement = conn.prepareStatement(OsagaInfra.CREATE_DBLINK_SQL);

travelbooking/travelagency-java/src/main/java/osaga/travelagency/TravelAgencyApplication.java

@@ -16,7 +16,7 @@
 
 public class TravelAgencyApplication {
 
-	public static void main(String[] args) throws Exception {
+	public static void main	(String[] args) throws Exception {
 		setProperty("oracle.jdbc.fanEnabled", "false");
 		new TravelAgencyApplication().bookTravel();
 	}
@@ -130,9 +130,18 @@ public String request(String sagaId, String payload) {
 		public void response(String sagaId, String payload) {
 			out.println("Response received:" + payload);
 			JSONObject obj = new JSONObject(payload);
-			if (obj.getString("HotelJava") != null) hotelStatus = "replyReceived";
-			else if (obj.getString("CarJava") != null) carStatus = "replyReceived";
-			else if (obj.getString("FlightJava") != null) flightStatus = "replyReceived";
+			if (obj.getString("HotelJava") != null) {
+				out.println("TravelAgencyTestListener.response HotelJava");
+				hotelStatus = "replyReceived";
+			}
+			else if (obj.getString("CarJava") != null) {
+				out.println("TravelAgencyTestListener.response CarJava");
+				carStatus = "replyReceived";
+			}
+			else if (obj.getString("FlightJava") != null) {
+				out.println("TravelAgencyTestListener.response FlightJava");
+				flightStatus = "replyReceived";
+			}
 		}
 
 		@Override