Revision: 049ee998f026
Author:   [email protected] <[email protected]>
Date:     Tue Jun  5 08:05:56 2012
Log: changed datatype to SMALLINT. Also changed JDK version dependency to 1.5
http://code.google.com/p/ussdgateway/source/detail?r=049ee998f026

Modified:
/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/jdbc/task/Schema.java
 /example/http/pom.xml
/example/http/src/main/java/org/mobicents/applications/ussd/example/TestServlet.java
 /pom.xml

=======================================
--- /core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/jdbc/task/Schema.java Tue May 22 00:37:35 2012 +++ /core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/jdbc/task/Schema.java Tue Jun 5 08:05:56 2012
@@ -81,27 +81,27 @@
     //TODO: baranowb: we need to check types if its enough for us.
     public static final String _TYPE_COLUMN_ID = "VARCHAR(150)";
     public static final String _TYPE_COLUMN_L_SPC = "INT";
-    public static final String _TYPE_COLUMN_L_SSN = "TINYINT";
-    public static final String _TYPE_COLUMN_L_RI = "TINYINT";
-    public static final String _TYPE_COLUMN_L_GT_I = "TINYINT";
+    public static final String _TYPE_COLUMN_L_SSN = "SMALLINT";
+    public static final String _TYPE_COLUMN_L_RI = "SMALLINT";
+    public static final String _TYPE_COLUMN_L_GT_I = "SMALLINT";
     public static final String _TYPE_COLUMN_L_GT_DIGITS = "VARCHAR(18)";
     public static final String _TYPE_COLUMN_R_SPC = "INT";
-    public static final String _TYPE_COLUMN_R_SSN = "TINYINT";
-    public static final String _TYPE_COLUMN_R_RI = "TINYINT";
-    public static final String _TYPE_COLUMN_R_GT_I = "TINYINT";
+    public static final String _TYPE_COLUMN_R_SSN = "SMALLINT";
+    public static final String _TYPE_COLUMN_R_RI = "SMALLINT";
+    public static final String _TYPE_COLUMN_R_GT_I = "SMALLINT";
     public static final String _TYPE_COLUMN_R_GT_DIGITS = "VARCHAR(18)";
     public static final String _TYPE_COLUMN_SERVICE_CODE = "VARCHAR(10)";
-    public static final String _TYPE_COLUMN_OR_NATURE = "TINYINT";
-    public static final String _TYPE_COLUMN_OR_PLAN = "TINYINT";
+    public static final String _TYPE_COLUMN_OR_NATURE = "SMALLINT";
+    public static final String _TYPE_COLUMN_OR_PLAN = "SMALLINT";
     public static final String _TYPE_COLUMN_OR_DIGITS = "VARCHAR(18)";
-    public static final String _TYPE_COLUMN_DE_NATURE = "TINYINT";
-    public static final String _TYPE_COLUMN_DE_PLAN = "TINYINT";
+    public static final String _TYPE_COLUMN_DE_NATURE = "SMALLINT";
+    public static final String _TYPE_COLUMN_DE_PLAN = "SMALLINT";
     public static final String _TYPE_COLUMN_DE_DIGITS = "VARCHAR(18)";
-    public static final String _TYPE_COLUMN_ISDN_NATURE = "TINYINT";
-    public static final String _TYPE_COLUMN_ISDN_PLAN = "TINYINT";
+    public static final String _TYPE_COLUMN_ISDN_NATURE = "SMALLINT";
+    public static final String _TYPE_COLUMN_ISDN_PLAN = "SMALLINT";
     public static final String _TYPE_COLUMN_ISDN_DIGITS = "VARCHAR(18)";
-    public static final String _TYPE_COLUMN_VLR_NATURE = "TINYINT";
-    public static final String _TYPE_COLUMN_VLR_PLAN = "TINYINT";
+    public static final String _TYPE_COLUMN_VLR_NATURE = "SMALLINT";
+    public static final String _TYPE_COLUMN_VLR_PLAN = "SMALLINT";
     public static final String _TYPE_COLUMN_VLR_DIGITS = "VARCHAR(18)";
     public static final String _TYPE_COLUMN_IMSI = "VARCHAR(100)";
     //THIS should be ENUM ?
=======================================
--- /example/http/pom.xml       Thu May 24 08:08:31 2012
+++ /example/http/pom.xml       Tue Jun  5 08:05:56 2012
@@ -17,6 +17,51 @@
                        <artifactId>xml</artifactId>
                        <version>${pom.version}</version>
                        <exclusions>
+                               <!--
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.asn</groupId>
+                                       <artifactId>asn</artifactId>
+                               </exclusion>
+                                -->
+
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.congestion</groupId>
+                                       <artifactId>congestion</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.isup</groupId>
+                                       <artifactId>isup-api</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.isup</groupId>
+                                       <artifactId>isup-impl</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.mtp</groupId>
+                                       <artifactId>mtp-api</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.mtp</groupId>
+                                       <artifactId>mtp</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.sccp</groupId>
+                                       <artifactId>sccp-api</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.sccp</groupId>
+                                       <artifactId>sccp-impl</artifactId>
+                               </exclusion>
+
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.tcap</groupId>
+                                       <artifactId>tcap-api</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       
<groupId>org.mobicents.protocols.ss7.tcap</groupId>
+                                       <artifactId>tcap-impl</artifactId>
+                               </exclusion>
+
                                <exclusion>
                                        <groupId>log4j</groupId>
                                        <artifactId>log4j</artifactId>
=======================================
--- /example/http/src/main/java/org/mobicents/applications/ussd/example/TestServlet.java Thu May 24 08:08:31 2012 +++ /example/http/src/main/java/org/mobicents/applications/ussd/example/TestServlet.java Tue Jun 5 08:05:56 2012
@@ -2,11 +2,13 @@

 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Arrays;

 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;

 import javolution.xml.stream.XMLStreamException;

@@ -51,6 +53,20 @@
                out.println("<html>");
                out.println("<body>");
                out.println("<h1>Hello USSD Demo Get</h1>");
+
+ USSDStringImpl ussdStr = new USSDStringImpl("USSD String : Hello World\n 1. Balance\n 2. Texts Remaining", null); + UnstructuredSSRequest unstructuredSSRequestIndication = new UnstructuredSSRequestImpl((byte) 0x0f, ussdStr,
+                               null, null);
+
+ Dialog copy = new Dialog(DialogType.CONTINUE, 1l, null, null, unstructuredSSRequestIndication);
+
+               try {
+                       byte[] data = factory.serialize(copy);
+                       System.out.println(Arrays.toString(data));
+               } catch (XMLStreamException e) {
+                       e.printStackTrace();
+               }
+
                out.println("</body>");
                out.println("</html>");
        }
@@ -60,7 +76,10 @@
                ServletInputStream is = request.getInputStream();
                try {
                        Dialog original = factory.deserialize(is);
-                       logger.info("Received Dialog = " + original);
+                       HttpSession session = request.getSession(true);
+                       if (logger.isInfoEnabled()) {
+ logger.info("doPost. HttpSession=" + session.getId() + " Dialog = " + original);
+                       }

                        USSDString ussdStr = null;
                        byte[] data = null;
@@ -70,12 +89,16 @@
                                switch (mapMessage.getMessageType()) {
                                case processUnstructuredSSRequest_Request:
ProcessUnstructuredSSRequest processUnstructuredSSRequest = (ProcessUnstructuredSSRequest) mapMessage; - logger.info("Received ProcessUnstructuredSSRequestIndication USSD String="
-                                                       + 
processUnstructuredSSRequest.getUSSDString().getString());
+                                       if (logger.isInfoEnabled()) {
+ logger.info("Received ProcessUnstructuredSSRequestIndication USSD String="
+                                                               + 
processUnstructuredSSRequest.getUSSDString().getString());
+                                               
session.setAttribute("ProcessUnstructuredSSRequest_InvokeId",
+                                                               
processUnstructuredSSRequest.getInvokeId());
+                                       }

ussdStr = new USSDStringImpl("USSD String : Hello World\n 1. Balance\n 2. Texts Remaining", null); - UnstructuredSSRequest unstructuredSSRequestIndication = new UnstructuredSSRequestImpl(
-                                                       (byte) 0x0f, ussdStr, 
null, null);
+ UnstructuredSSRequest unstructuredSSRequestIndication = new UnstructuredSSRequestImpl((byte) 0x0f,
+                                                       ussdStr, null, null);

Dialog copy = new Dialog(DialogType.CONTINUE, original.getId(), null, null,
                                                        
unstructuredSSRequestIndication);
@@ -100,13 +123,16 @@
                                case unstructuredSSRequest_Response:
UnstructuredSSResponse unstructuredSSResponse = (UnstructuredSSResponseImpl) mapMessage;

+ long invokeId = (Long) session.getAttribute("ProcessUnstructuredSSRequest_InvokeId");
+
                                        logger.info("Received UnstructuredSSResponse 
USSD String="
-                                                       + 
unstructuredSSResponse.getUSSDString().getString());
+ + unstructuredSSResponse.getUSSDString().getString() + " HttpSession=" + session.getId()
+                                                       + " invokeId=" + 
invokeId);

                                        ussdStr = new USSDStringImpl("Thank 
You!", null);
ProcessUnstructuredSSResponseImpl processUnstructuredSSResponseIndication = new ProcessUnstructuredSSResponseImpl(
                                                        (byte) 0x0f, ussdStr);
- processUnstructuredSSResponseIndication.setInvokeId(mapMessage.getInvokeId());
+                                       
processUnstructuredSSResponseIndication.setInvokeId(invokeId);

Dialog copy1 = new Dialog(DialogType.END, original.getId(), processUnstructuredSSResponseIndication);

@@ -114,6 +140,13 @@

                                        response.getOutputStream().write(data);
                                        response.flushBuffer();
+
+                                       try {
+
+                                       } catch (Exception e) {
+                                               session.invalidate();
+ logger.error("Error while invalidating HttpSession=" + session.getId());
+                                       }
                                        break;
                                default:
                                        // This is error. If its begin it 
should be only Process
=======================================
--- /pom.xml    Thu May 24 08:08:31 2012
+++ /pom.xml    Tue Jun  5 08:05:56 2012
@@ -25,7 +25,7 @@

                
<jboss.microcontainer.version>2.2.0.M2</jboss.microcontainer.version>
                <compiler.plugin.version>2.0.2</compiler.plugin.version>
-               <compile.source>1.7</compile.source>
+               <compile.source>1.5</compile.source>
                <testng.version>6.2</testng.version>
                <javolution.version>5.5.1</javolution.version>
                <javassist.version>3.9.0.GA</javassist.version>

Reply via email to