Revision: 16080
Author: [email protected]
Date: Tue Dec 28 07:05:04 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16080
Added:
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetStream.java
Modified:
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Link.java
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Linkset.java
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetSelector.java
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetSelectorKey.java
=======================================
--- /dev/null
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetStream.java
Tue Dec 28 07:05:04 2010
@@ -0,0 +1,18 @@
+package org.mobicents.ss7.linkset.oam;
+
+import org.mobicents.protocols.stream.api.Stream;
+
+public abstract class LinksetStream implements Stream {
+
+ protected LinksetSelectorKey selectorKey = null;
+
+ /**
+ * Poll the respective stream for readiness
+ *
+ * @param operation
+ * @param timeout
+ * @return
+ */
+ public abstract boolean poll(int operation, int timeout);
+
+}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Link.java
Mon Dec 27 22:51:46 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Link.java
Tue Dec 28 07:05:04 2010
@@ -1,5 +1,6 @@
package org.mobicents.ss7.linkset.oam;
+import javolution.text.TextBuilder;
import javolution.xml.XMLFormat;
import javolution.xml.XMLSerializable;
import javolution.xml.stream.XMLStreamException;
@@ -10,6 +11,8 @@
*
*/
public abstract class Link implements XMLSerializable {
+
+ public static final String SPACE = " ";
protected String linkName = null;
@@ -92,4 +95,12 @@
}
};
-}
+
+ public abstract void print(StringBuffer sb, int leftPad, int descPad);
+
+ protected void createPad(StringBuffer sb, int pad) {
+ for (int i = 0; i < pad; i++) {
+ sb.append(' ');
+ }
+ }
+}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Linkset.java
Mon Dec 27 22:51:46 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Linkset.java
Tue Dec 28 07:05:04 2010
@@ -1,22 +1,15 @@
package org.mobicents.ss7.linkset.oam;
-import java.io.IOException;
-
import javolution.util.FastMap;
import javolution.xml.XMLFormat;
import javolution.xml.XMLSerializable;
import javolution.xml.stream.XMLStreamException;
-import org.mobicents.protocols.stream.api.SelectorKey;
-import org.mobicents.protocols.stream.api.SelectorProvider;
-import org.mobicents.protocols.stream.api.Stream;
-import org.mobicents.protocols.stream.api.StreamSelector;
-
/**
*
* @author amit bhayani
*/
-public abstract class Linkset implements XMLSerializable, Stream {
+public abstract class Linkset implements XMLSerializable {
private static final String LINKSET_NAME = "name";
private static final String LINKSET_STATE = "state";
@@ -40,26 +33,31 @@
protected LinksetSelectorKey selectorKey = null;
+ protected LinksetStream linksetStream = null;
+
// Hold Links here. Link name as key and actual Link as Object
protected FastMap<String, Link> links = new FastMap<String, Link>();
public Linkset() {
-
- }
-
- public Linkset(String linksetName, String type){
-
+ this.initialize();
}
public Linkset(String linksetName, int opc, int dpc, int ni) {
+ this();
this.linksetName = linksetName;
this.opc = opc;
this.dpc = dpc;
this.ni = ni;
}
- // Initialize the Link. Depends on Type of Link
- protected abstract void init() throws Exception;
+ protected abstract void initialize();
+
+ // Configure the Linkset. Depends on Type of Link
+ protected abstract void configure() throws Exception;
+
+ public LinksetStream getLinksetStream() {
+ return this.linksetStream;
+ }
public int getDpc() {
return dpc;
@@ -108,29 +106,26 @@
public void setLinks(FastMap<String, Link> links) {
this.links = links;
}
+
+ public Link getLink(String linkName) {
+ return this.links.get(linkName);
+ }
/**
* Operations
*/
public abstract void createLink(String[] options) throws Exception;
-
+
public abstract void deleteLink(String linkName) throws Exception;
- public Link getLink(String linkName) {
- return this.links.get(linkName);
- }
-
public abstract void activate() throws Exception;
-
+
public abstract void deactivate() throws Exception;
-
+
public abstract void activateLink(String linkName) throws Exception;
-
+
public abstract void deactivateLink(String linkName) throws Exception;
- // Poll the LinkSets for readiness
- protected abstract boolean poll(int operation, int timeout);
-
/**
* XML Serialization/Deserialization
*/
@@ -177,32 +172,4 @@
}
};
-
- /**
- * Stream Impl
- */
- public SelectorKey register(StreamSelector selector) throws
IOException {
- return ((LinksetSelector) selector).register(this);
- }
-
- public abstract int read(byte[] b) throws IOException;
-
- public abstract int write(byte[] d) throws IOException;
-
- /**
- * Closes this streamer implementation. After closing stream its
selectors
- * are invalidated!
- */
- public void close() {
-
- }
-
- /**
- * Returns the provider that created this stream.
- *
- * @return
- */
- public SelectorProvider provider() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-}
+}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetSelector.java
Mon Dec 27 04:21:44 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetSelector.java
Tue Dec 28 07:05:04 2010
@@ -12,61 +12,61 @@
/**
*
* @author amit bhayani
- *
+ *
*/
public class LinksetSelector implements StreamSelector {
- private static final Logger logger = Logger
- .getLogger(LinksetSelector.class);
-
- private ArrayList<Stream> registered = new ArrayList<Stream>();
-
- /** array of selected channels */
- private ArrayList<SelectorKey> selected = new ArrayList<SelectorKey>();
-
- public LinksetSelector() {
- // TODO Auto-generated constructor stub
- }
-
- protected SelectorKey register(Linkset linkSet) {
- // add LinkSet instance to the collection
- registered.add(linkSet);
-
- LinksetSelectorKey key = new LinksetSelectorKey(linkSet, this);
- linkSet.selectorKey = key;
- return key;
- }
-
- public void unregister(Linkset linkSet) {
- registered.remove(linkSet);
- linkSet.selectorKey = null;
-
- // TODO : Should some method be called in LinkSet indicating
that its
- // Unregistered for cleanup?
- }
-
- public void close() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public Collection<Stream> getRegisteredStreams() {
- return registered;
- }
-
- public boolean isClosed() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public Collection<SelectorKey> selectNow(int operation, int timeout)
- throws IOException {
-
- selected.clear();
- for (Stream s : registered) {
- if (((Linkset) s).poll(operation, timeout)) {
- selected.add(((Linkset) s).selectorKey);
- }
- }
- return selected;
- }
+ private static final Logger logger = Logger
+ .getLogger(LinksetSelector.class);
+
+ private ArrayList<Stream> registered = new ArrayList<Stream>();
+
+ /** array of selected channels */
+ private ArrayList<SelectorKey> selected = new ArrayList<SelectorKey>();
+
+ public LinksetSelector() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public SelectorKey register(LinksetStream linkSet) {
+ // add LinkSet instance to the collection
+ registered.add(linkSet);
+
+ LinksetSelectorKey key = new LinksetSelectorKey(linkSet, this);
+ linkSet.selectorKey = key;
+ return key;
+ }
+
+ public void unregister(LinksetStream linkSet) {
+ registered.remove(linkSet);
+ linkSet.selectorKey = null;
+
+ // TODO : Should some method be called in LinkSet indicating that
its
+ // Unregistered for cleanup?
+ }
+
+ public void close() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public Collection<Stream> getRegisteredStreams() {
+ return registered;
+ }
+
+ public boolean isClosed() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public Collection<SelectorKey> selectNow(int operation, int timeout)
+ throws IOException {
+
+ selected.clear();
+ for (Stream s : registered) {
+ if (((LinksetStream) s).poll(operation, timeout)) {
+ selected.add(((LinksetStream) s).selectorKey);
+ }
+ }
+ return selected;
+ }
}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetSelectorKey.java
Mon Dec 27 04:21:44 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetSelectorKey.java
Tue Dec 28 07:05:04 2010
@@ -15,12 +15,12 @@
private boolean isReadable;
private boolean isWritable;
- private Linkset linkSet = null;
+ private LinksetStream linkSet = null;
private LinksetSelector linkSetSelector = null;
private Object attachment;
- public LinksetSelectorKey(Linkset linkSet, LinksetSelector
linkSetSelector) {
+ public LinksetSelectorKey(LinksetStream linkSet, LinksetSelector
linkSetSelector) {
this.linkSet = linkSet;
this.linkSetSelector = linkSetSelector;
}