Revision: 15892
Author: [email protected]
Date: Mon Dec 20 08:54:18 2010
Log: More fixes for Linkset / Link
http://code.google.com/p/mobicents/source/detail?r=15892

Modified:
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/Linkset.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetManager.java

=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/Linkset.java Mon Dec 20 07:02:12 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/Linkset.java Mon Dec 20 08:54:18 2010
@@ -96,6 +96,10 @@
        public void setState(int state) {
                this.state = state;
        }
+
+       public int getMode() {
+               return mode;
+       }

        public FastMap<TextBuilder, Link> getLinks() {
                return links;
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetManager.java Mon Dec 20 07:02:12 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetManager.java Mon Dec 20 08:54:18 2010
@@ -2,6 +2,7 @@

 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.nio.ByteBuffer;

@@ -11,7 +12,6 @@
 import javolution.xml.XMLBinding;
 import javolution.xml.XMLObjectReader;
 import javolution.xml.XMLObjectWriter;
-import javolution.xml.XMLReferenceResolver;
 import javolution.xml.stream.XMLStreamException;

 import org.apache.log4j.Logger;
@@ -35,6 +35,8 @@

        private static final String TAB_INDENT = "\t";

+       private static final XMLBinding binding = new XMLBinding();
+
        private final TextBuilder persistDir = TextBuilder.newInstance();

        // Hold LinkSet here. LinkSet's name as key and actual LinkSet as Object
@@ -48,6 +50,14 @@
                                System.getProperty(LINKSET_PERSIST_DIR_KEY, 
System
                                                
.getProperty(USER_DIR_KEY))).append(File.separator)
                                .append(PERSIST_FILE_NAME);
+
+               logger.info(String.format(
+                               "SS7 configuration file will be persisted at 
%s", logger
+                                               .toString()));
+
+               binding.setAlias(Linkset.class, LINKSET);
+               binding.setAlias(Link.class, LINK);
+               binding.setClassAttribute(CLASS_ATTRIBUTE);
        }

        /**
@@ -60,6 +70,10 @@
public void setLinksetFactories(FastList<LinksetFactory> linksetFactories) {
                this.linksetFactories = linksetFactories;
        }
+
+       public FastMap<TextBuilder, Linkset> getLinksets() {
+               return linksets;
+       }

        /**
         * Operations
@@ -335,16 +349,11 @@
                // TODO : Should we keep reference to Objects rather than 
recreating
                // everytime?
                try {
-                       XMLBinding binding = new XMLBinding();
-                       binding.setAlias(Linkset.class, LINKSET);
-                       binding.setAlias(Link.class, LINK);
-                       binding.setClassAttribute(CLASS_ATTRIBUTE);
-
                        XMLObjectWriter writer = XMLObjectWriter
                                        .newInstance(new 
FileOutputStream(persistDir.toString()));
                        writer.setBinding(binding);
                        // Enables cross-references.
-                       writer.setReferenceResolver(new XMLReferenceResolver());
+                       // writer.setReferenceResolver(new 
XMLReferenceResolver());
                        writer.setIndentation(TAB_INDENT);

for (FastMap.Entry<TextBuilder, Linkset> e = this.linksets.head(), end = this.linksets
@@ -364,18 +373,16 @@
         *
         * @throws Exception
         */
-       public void load() throws Exception {
-               XMLBinding binding = new XMLBinding();
-               binding.setAlias(Linkset.class, LINKSET);
-               binding.setAlias(Link.class, LINK);
-               binding.setClassAttribute(CLASS_ATTRIBUTE);
-
-               XMLObjectReader reader = XMLObjectReader
-                               .newInstance(new 
FileInputStream(persistDir.toString()));
-               reader.setBinding(binding);
-               reader.setReferenceResolver(new XMLReferenceResolver());
-
+       public void load() throws FileNotFoundException {
+
+               XMLObjectReader reader = null;
                try {
+                       reader = XMLObjectReader.newInstance(new 
FileInputStream(persistDir
+                                       .toString()));
+
+                       reader.setBinding(binding);
+                       // reader.setReferenceResolver(new 
XMLReferenceResolver());
+
                        // FIXME : Bug in .hasNext()
                        // http://markmail.org/message/c6lsehxlxv2hua5p. It 
shouldn't throw
                        // Exception
@@ -384,54 +391,54 @@
                                this.linksets.put(linkset.getLinkSetName(), 
linkset);
                        }
                } catch (XMLStreamException ex) {
-                       this.logger.info(
-                                       "Error while re-creating Linksets from 
persisted file", ex);
+//                     this.logger.info(
+//                                     "Error while re-creating Linksets from 
persisted file", ex);
                }
        }

        public static void main(String args[]) throws Exception {
-//             ByteBuffer byteBuffer = ByteBuffer.allocate(128);
-//             LinksetManager linkSetManager = new LinksetManager();
-//
-// FastList<LinksetFactory> linkSetFactories = new FastList<LinksetFactory>();
-//             linkSetFactories.add(new DahdiLinksetFactory());
-//             linkSetFactories.add(new DialogicLinksetFactory());
-//             linkSetFactories.add(new M3UALinksetFactory());
-//
-//             linkSetManager.setLinksetFactories(linkSetFactories);
-//
-// linkSetManager.addLinkset(new TextBuilder("LinkSet1"), 105, byteBuffer);
-//             System.out.println(new String(byteBuffer.array()));
-//             byteBuffer.clear();
-// linkSetManager.addLinkset(new TextBuilder("LinkSet2"), 106, byteBuffer);
-//             System.out.println(new String(byteBuffer.array()));
-//             byteBuffer.clear();
-//
-//             linkSetManager.addLink(new TextBuilder("LinkSet1"), new 
TextBuilder(
-//                             "Link1"), byteBuffer);
-//             System.out.println(new String(byteBuffer.array()));
-//             byteBuffer.clear();
-//
-//             linkSetManager.addLink(new TextBuilder("LinkSet1"), new 
TextBuilder(
-//                             "Link2"), byteBuffer);
-//             System.out.println(new String(byteBuffer.array()));
-//             byteBuffer.clear();
-//
-//             linkSetManager.addLink(new TextBuilder("LinkSet1"), new 
TextBuilder(
-//                             "Link3"), byteBuffer);
-//             System.out.println(new String(byteBuffer.array()));
-//             byteBuffer.clear();
-//
-// linkSetManager.addLinkset(new TextBuilder("LinkSet3"), 107, byteBuffer);
-//             System.out.println(new String(byteBuffer.array()));
-//             byteBuffer.clear();
-//
-//             linkSetManager.store();
-
-               LinksetManager linkSetManager1 = new LinksetManager();
+               ByteBuffer byteBuffer = ByteBuffer.allocate(128);
+               LinksetManager linkSetManager = new LinksetManager();
+
+ FastList<LinksetFactory> linkSetFactories = new FastList<LinksetFactory>();
+               linkSetFactories.add(new DahdiLinksetFactory());
+               linkSetFactories.add(new DialogicLinksetFactory());
+               linkSetFactories.add(new M3UALinksetFactory());
+
+               linkSetManager.setLinksetFactories(linkSetFactories);
+
+               linkSetManager.addLinkset(new TextBuilder("LinkSet1"), 105, 
byteBuffer);
+               System.out.println(new String(byteBuffer.array()));
+               byteBuffer.clear();
+               linkSetManager.addLinkset(new TextBuilder("LinkSet2"), 106, 
byteBuffer);
+               System.out.println(new String(byteBuffer.array()));
+               byteBuffer.clear();
+
+               linkSetManager.addLink(new TextBuilder("LinkSet1"), new 
TextBuilder(
+                               "Link1"), byteBuffer);
+               System.out.println(new String(byteBuffer.array()));
+               byteBuffer.clear();
+
+               linkSetManager.addLink(new TextBuilder("LinkSet1"), new 
TextBuilder(
+                               "Link2"), byteBuffer);
+               System.out.println(new String(byteBuffer.array()));
+               byteBuffer.clear();
+
+               linkSetManager.addLink(new TextBuilder("LinkSet1"), new 
TextBuilder(
+                               "Link3"), byteBuffer);
+               System.out.println(new String(byteBuffer.array()));
+               byteBuffer.clear();
+
+               linkSetManager.addLinkset(new TextBuilder("LinkSet3"), 107, 
byteBuffer);
+               System.out.println(new String(byteBuffer.array()));
+               byteBuffer.clear();
+
+               linkSetManager.store();
+
+               LinksetManager linkSetManager1 = new LinksetManager();
                linkSetManager1.load();
-
+
                System.out.println(linkSetManager1.linksets.size());
-       }
+       }

 }

Reply via email to