Revision: 16068
Author: [email protected]
Date: Mon Dec 27 04:51:55 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16068
Modified:
/trunk/protocols/ss7/service/pom.xml
/trunk/protocols/ss7/service/src/main/assembly/pojo.xml
/trunk/protocols/ss7/service/src/main/config/jboss-beans.xml
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java
=======================================
--- /trunk/protocols/ss7/service/pom.xml Wed Dec 22 03:47:15 2010
+++ /trunk/protocols/ss7/service/pom.xml Mon Dec 27 04:51:55 2010
@@ -1,147 +1,168 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>ss7-parent</artifactId>
- <groupId>org.mobicents.protocols.ss7</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>mobicents-ss7</artifactId>
- <groupId>org.mobicents.protocols.ss7</groupId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Mobicents SS7</name>
- <properties>
- <maven.test.skip>false</maven.test.skip>
- </properties>
- <developers>
- <developer>
- <id>oleg.kulikoff</id>
- <name>Oleg Kulikoff</name>
- <email>[email protected]</email>
- <organization>JBoss/Red Hat</organization>
- <organizationUrl>http://www.redhat.com/</organizationUrl>
- <roles>
- <role>Active Developer</role>
- </roles>
- <timezone>+3</timezone>
- </developer>
- <developer>
- <id>amit.bhayani</id>
- <name>Amit Bhayani</name>
- <email>[email protected]</email>
- <organization>JBoss/Red Hat</organization>
- <organizationUrl>http://www.redhat.com/</organizationUrl>
- <roles>
- <role>Active Developer</role>
- </roles>
- <timezone>+5.5</timezone>
- </developer>
- <developer>
- <id>baranowb</id>
- <name>Bartosz Baranowski</name>
- <email>[email protected]</email>
- <organization>JBoss/Red Hat</organization>
- <organizationUrl>http://www.redhat.com/</organizationUrl>
- <roles>
- <role>Active Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>GNU GENERAL PUBLIC LICENSE</name>
- <url>http://www.gnu.org/licenses/gpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <dependencies>
- <dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ss7-parent</artifactId>
+ <groupId>org.mobicents.protocols.ss7</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mobicents-ss7</artifactId>
+
+ <name>Mobicents SS7</name>
+ <properties>
+ <maven.test.skip>false</maven.test.skip>
+ </properties>
+ <developers>
+ <developer>
+ <id>oleg.kulikoff</id>
+ <name>Oleg Kulikoff</name>
+ <email>[email protected]</email>
+ <organization>JBoss/Red Hat</organization>
+
<organizationUrl>http://www.redhat.com/</organizationUrl>
+ <roles>
+ <role>Active Developer</role>
+ </roles>
+ <timezone>+3</timezone>
+ </developer>
+ <developer>
+ <id>amit.bhayani</id>
+ <name>Amit Bhayani</name>
+ <email>[email protected]</email>
+ <organization>JBoss/Red Hat</organization>
+
<organizationUrl>http://www.redhat.com/</organizationUrl>
+ <roles>
+ <role>Active Developer</role>
+ </roles>
+ <timezone>+5.5</timezone>
+ </developer>
+ <developer>
+ <id>baranowb</id>
+ <name>Bartosz Baranowski</name>
+ <email>[email protected]</email>
+ <organization>JBoss/Red Hat</organization>
+
<organizationUrl>http://www.redhat.com/</organizationUrl>
+ <roles>
+ <role>Active Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU GENERAL PUBLIC LICENSE</name>
+ <url>http://www.gnu.org/licenses/gpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
<!-- This comes in container. -->
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <version>${jboss.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mobicents.protocols.ss7.sccp</groupId>
- <artifactId>sccp-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mobicents.protocols.ss7.sccp</groupId>
- <artifactId>sccp-impl</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <artifactId>mtp</artifactId>
- <groupId>org.mobicents.protocols.ss7.mtp</groupId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javolution</groupId>
- <artifactId>javolution</artifactId>
- </dependency>
- <dependency>
- <artifactId>shell</artifactId>
- <groupId>org.mobicents.protocols.ss7.management</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <finalName>${pom.artifactId}-${pom.version}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${jboss.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.ss7.sccp</groupId>
+ <artifactId>sccp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.ss7.sccp</groupId>
+ <artifactId>sccp-impl</artifactId>
+ </dependency>
+ <dependency>
+ <artifactId>mtp</artifactId>
+ <groupId>org.mobicents.protocols.ss7.mtp</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>linkset</artifactId>
+
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ </dependency>
+
+ <!-- Hardware Dahdi Java-->
+ <dependency>
+ <artifactId>mobicents-dahdi</artifactId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ </dependency>
+
+ <!-- Hardware Dialogic Java-->
+ <dependency>
+ <artifactId>mobicents-dialogic</artifactId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ </dependency>
+
+ <!-- /hardware m3ua Java-->
+ <dependency>
+ <artifactId>mobicents-m3ua</artifactId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javolution</groupId>
+ <artifactId>javolution</artifactId>
+ </dependency>
+ <dependency>
+ <artifactId>shell</artifactId>
+
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>${pom.artifactId}-${pom.version}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>
src/main/assembly/pojo.xml
- </descriptor>
- </descriptors>
+ </descriptor>
+ </descriptors>
<!-- this is doubled in sccp-beans -->
- <finalName>mobicents-ss7</finalName>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>directory-inline</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <finalName>mobicents-ss7</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+
<goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<groupId>org.mobicents.tools</groupId>
@@ -163,17 +184,17 @@
</eclipseProjectName>
</configuration>
</plugin>
- </plugins>
- </build>
- <scm>
- <connection>
+ </plugins>
+ </build>
+ <scm>
+ <connection>
scm:svn:https://mobicents.googlecode.com/svn/trunk/protocols/ss7/sccp
- </connection>
- <developerConnection>
+ </connection>
+ <developerConnection>
scm:svn:https://mobicents.googlecode.com/svn/trunk/protocols/ss7/sccp
- </developerConnection>
- <url>
+ </developerConnection>
+ <url>
http://mobicents.googlecode.com/svn/trunk/protocols/ss7/sccp
- </url>
- </scm>
+ </url>
+ </scm>
</project>
=======================================
--- /trunk/protocols/ss7/service/src/main/assembly/pojo.xml Tue Dec 21
22:46:26 2010
+++ /trunk/protocols/ss7/service/src/main/assembly/pojo.xml Mon Dec 27
04:51:55 2010
@@ -34,6 +34,11 @@
<include>org.mobicents.protocols.ss7:mobicents-ss7</include>
<include>javolution:javolution</include>
<include>org.mobicents.protocols.ss7.management:shell</include>
+
<include>org.mobicents.protocols.ss7.management:linkset</include>
+
+
<include>org.mobicents.protocols.ss7.hardware:mobicents-dahdi</include>
+
<include>org.mobicents.protocols.ss7.hardware:mobicents-dialogic</include>
+
<include>org.mobicents.protocols.ss7.hardware:mobicents-m3ua</include>
</includes>
</dependencySet>
=======================================
--- /trunk/protocols/ss7/service/src/main/config/jboss-beans.xml Mon Dec 27
00:10:16 2010
+++ /trunk/protocols/ss7/service/src/main/config/jboss-beans.xml Mon Dec 27
04:51:55 2010
@@ -2,51 +2,29 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="LinksetFactoryFactory"
+ class="org.mobicents.ss7.linkset.oam.LinksetFactoryFactory">
+ <incallback method="addFactory" />
+ <uncallback method="removeFactory" />
+ </bean>
+
<bean name="DahdiLinksetFactory"
- class="org.mobicents.protocols.ss7.mtp.oam.DahdiLinksetFactory">
+
class="org.mobicents.ss7.hardware.dahdi.oam.DahdiLinksetFactory">
</bean>
<bean name="DialogicLinksetFactory"
-
class="org.mobicents.protocols.ss7.mtp.oam.DialogicLinksetFactory">
+
class="org.mobicents.ss7.hardware.dialogic.oam.DialogicLinksetFactory">
</bean>
<bean name="M3UALinksetFactory"
- class="org.mobicents.protocols.ss7.mtp.oam.M3UALinksetFactory">
+ class="org.mobicents.ss7.m3ua.oam.M3UALinksetFactory">
</bean>
- <bean name="LinksetFactoryFactory"
-
class="org.mobicents.protocols.ss7.mtp.oam.LinksetFactoryFactory">
- <property name="linksetFactories">
-
- <map keyClass="java.lang.String"
-
valueClass="org.mobicents.protocols.ss7.mtp.oam.LinksetFactory">
- <entry>
- <key>dahdi</key>
- <value>
- <inject bean="DahdiLinksetFactory"
/>
- </value>
- </entry>
- <entry>
- <key>dialogic</key>
- <value>
- <inject
bean="DialogicLinksetFactory" />
- </value>
- </entry>
- <entry>
- <key>m3ua</key>
- <value>
- <inject bean="M3UALinksetFactory"
/>
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
<bean name="LinksetManager"
- class="org.mobicents.protocols.ss7.mtp.oam.LinksetManager">
+ class="org.mobicents.ss7.linkset.oam.LinksetManager">
<property name="linksetFactoryFactory">
- <inject bean="LinksetFactoryFactory" />
+ <inject bean="LinksetFactoryFactory" />
</property>
<property name="persistDir">${jboss.server.data.dir}</property>
</bean>
=======================================
---
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java
Mon Dec 27 00:10:16 2010
+++
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java
Mon Dec 27 04:51:55 2010
@@ -1,7 +1,7 @@
package org.mobicents.ss7;
-import org.mobicents.protocols.ss7.management.console.LinksetListener;
-import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
+import org.mobicents.ss7.linkset.oam.LinksetManager;
+import org.mobicents.ss7.management.console.LinksetListener;
public class LinksetListenerImpl implements LinksetListener {
=======================================
---
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java
Mon Dec 27 00:10:16 2010
+++
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java
Mon Dec 27 04:51:55 2010
@@ -25,8 +25,8 @@
import org.apache.log4j.Logger;
import org.jboss.system.ServiceMBeanSupport;
-import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
import org.mobicents.protocols.ss7.sccp.impl.SccpStackImpl;
+import org.mobicents.ss7.linkset.oam.LinksetManager;
/**
* @author amit bhayani
=======================================
---
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java
Mon Dec 27 00:10:16 2010
+++
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java
Mon Dec 27 04:51:55 2010
@@ -26,8 +26,8 @@
import javolution.util.FastList;
import org.apache.log4j.Logger;
-import org.mobicents.protocols.ss7.management.console.Subject;
-import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
+import org.mobicents.ss7.linkset.oam.LinksetManager;
+import org.mobicents.ss7.management.console.Subject;
import org.mobicents.ss7.management.transceiver.ChannelProvider;
import org.mobicents.ss7.management.transceiver.ChannelSelectionKey;
import org.mobicents.ss7.management.transceiver.ChannelSelector;