Revision: 16082
Author: baranowb
Date: Tue Dec 28 07:25:14 2010
Log: [SLEE] enable - publication, some fixes to doc, file names and example.
http://code.google.com/p/mobicents/source/detail?r=16082
Added:
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildSbbLocalObject.java
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParentSbbLocalObject.java
Deleted:
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildLocalObject.java
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParentLocalObject.java
Modified:
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Author_Group.xml
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Integrating_The_Enabler.xml
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Introduction.xml
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Using_The_Enabler.xml
/trunk/servers/jain-slee/enablers/sip-publication-client/example/sbb/src/main/java/org/mobicents/slee/enabler/sip/example/PublicationClientParentSbb.java
/trunk/servers/jain-slee/enablers/sip-publication-client/example/sbb/src/main/resources/META-INF/sbb-jar.xml
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChild.java
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildSbb.java
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParent.java
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/resources/META-INF/sbb-jar.xml
=======================================
--- /dev/null
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildSbbLocalObject.java
Tue Dec 28 07:25:14 2010
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but
WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.mobicents.slee.enabler.sip;
+
+import javax.slee.SbbLocalObject;
+
+/**
+ * @author baranowb
+ *
+ */
+public interface PublicationClientChildSbbLocalObject extends
PublicationClientChild,SbbLocalObject {
+
+}
=======================================
--- /dev/null
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParentSbbLocalObject.java
Tue Dec 28 07:25:14 2010
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but
WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.mobicents.slee.enabler.sip;
+
+import javax.slee.SbbLocalObject;
+
+/**
+ * @author baranowb
+ *
+ */
+public interface PublicationClientParentSbbLocalObject extends
PublicationClientParent,SbbLocalObject {
+
+}
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildLocalObject.java
Fri Dec 17 06:32:44 2010
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but
WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.mobicents.slee.enabler.sip;
-
-import javax.slee.SbbLocalObject;
-
-/**
- * @author baranowb
- *
- */
-public interface PublicationClientChildLocalObject extends
PublicationClientChild,SbbLocalObject {
-
-}
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParentLocalObject.java
Fri Dec 17 06:32:44 2010
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but
WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.mobicents.slee.enabler.sip;
-
-import javax.slee.SbbLocalObject;
-
-/**
- * @author baranowb
- *
- */
-public interface PublicationClientParentLocalObject extends
PublicationClientParent,SbbLocalObject {
-
-}
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Author_Group.xml
Fri Dec 17 06:32:44 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Author_Group.xml
Tue Dec 28 07:25:14 2010
@@ -8,6 +8,7 @@
<author>
<firstname>Bartosz</firstname>
<surname>Baranowski</surname>
- <email>&AUTHOR_EMAIL_EDUARDO;</email>
+ <email>&AUTHOR.EMAIL.BARANOWB;</email>
</author>
</authorgroup>
+
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Integrating_The_Enabler.xml
Tue Dec 28 04:06:40 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Integrating_The_Enabler.xml
Tue Dec 28 07:25:14 2010
@@ -53,7 +53,7 @@
<para>
The SbbLocalObject which must be used or extended by
the Parent's Sbb
is named
-
<literal>org.mobicents.slee.enabler.sip.PublicationClientParentLocalObject
+
<literal>org.mobicents.slee.enabler.sip.PublicationClientParentSbbLocalObject
</literal>
, which extends the
<literal>javax.slee.SbbLocalObject</literal>
@@ -69,13 +69,13 @@
public interface PublicationClientParent {
- public void afterNewPublication(Result result,
PublicationClientChildLocalInterface child);
-
- public void afterRefreshPublication(Result result,
PublicationClientChildLocalInterface child);
-
- public void afterUpdatePublication(Result result,
PublicationClientChildLocalInterface child);
-
- public void afterRemovePublication(Result result,
PublicationClientChildLocalInterface child);
+ public void afterNewPublication(Result result,
PublicationClientChildLocalObject child);
+
+ public void afterRefreshPublication(Result result,
PublicationClientChildLocalObject child);
+
+ public void afterUpdatePublication(Result result,
PublicationClientChildLocalObject child);
+
+ public void afterRemovePublication(Result result,
PublicationClientChildLocalObject child);
void newPublicationFailed(PublicationClientChildLocalObject
sbbLocalObject);
@@ -92,7 +92,7 @@
<term>
The
<literal>afterNewPublication(Result
result,
- PublicationClientChildLocalInterface
child);</literal>
+ PublicationClientChildLocalObject
child);</literal>
method:
</term>
<listitem>
@@ -105,7 +105,7 @@
<term>
The
<literal>afterRefreshPublication(Result
result,
- PublicationClientChildLocalInterface
child);</literal>
+ PublicationClientChildLocalObject
child);</literal>
method:
</term>
<listitem>
@@ -117,7 +117,7 @@
<term>
The
<literal>afterUpdatePublication(Result
result,
- PublicationClientChildLocalInterface
child);</literal>
+ PublicationClientChildLocalObject
child);</literal>
method:
</term>
<listitem>
@@ -129,7 +129,7 @@
<term>
The
<literal>afterRemovePublication(Result
result,
- PublicationClientChildLocalInterface
child);</literal>
+ PublicationClientChildLocalObject
child);</literal>
method:
</term>
<listitem>
@@ -179,7 +179,7 @@
<para>
The Parent Sbb Abstract Class must implement the
callbacks on it's
SbbLocalObject, that is, must implement the
-
<literal>org.mobicents.slee.enabler.xdmc.XDMClientParent</literal>
+
<literal>org.mobicents.slee.enabler.sip.PublicationClientParent</literal>
interface discussed in last section.
</para>
<para>
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Introduction.xml
Fri Dec 17 06:32:44 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Introduction.xml
Tue Dec 28 07:25:14 2010
@@ -21,7 +21,7 @@
which can be used in child relations, with a simple synchronous
interface.
</para>
-
+ <para>Enabler abstracts communication described in <link
linkend="http://tools.ietf.org/html/rfc3903">RFC3903</link>. </para>
<para>The SIP Presence Server is a functional element used to manage UA
status.
Server performs following tasks:</para>
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Using_The_Enabler.xml
Tue Dec 28 04:06:40 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/docs/sources/src/main/resources/en-US/Chapter-Using_The_Enabler.xml
Tue Dec 28 07:25:14 2010
@@ -54,7 +54,7 @@
<para>The &THIS.PLATFORM;
JAIN SLEE &THIS.ENABLER;
Enabler Sbb, the Child Sbb, implements the
-
<literal>org.mobicents.slee.enabler.sip.PublicationClientChildLocalObject
+
<literal>org.mobicents.slee.enabler.sip.PublicationClientChildSbbLocalObject
</literal>
, which extends the
<literal>javax.slee.SbbLocalObject</literal>
@@ -222,9 +222,9 @@
if (childRelation.isEmpty()) {
try {
// creates new instance
- SipPublicationClientChildSbbLocalInterface sbb =
(SipPublicationClientChildSbbLocalInterface) childRelation.create();
+ SipPublicationClientChildSbbLocalInterface sbb =
(PublicationClientChildSbbLocalObject) childRelation.create();
// passes the parent sbb local object to the
child
- sbb.setParentSbb((SipPublicationClientParentSbbLocalInterface)
sbbContext.getSbbLocalObject());
+ sbb.setParentSbb((PublicationClientParentSbbLocalObject)
sbbContext.getSbbLocalObject());
return sbb;
} catch (Exception e) {
tracer.severe("Failed to create child sbb", e);
@@ -235,15 +235,18 @@
Iterator it = childRelation.iterator();
while(it.hasNext())
{
- SipPublicationClientChildSbbLocalInterface child =
(SipPublicationClientChildSbbLocalInterface)
childRelation.iterator().next();
+ PublicationClientChildSbbLocalObject child =
(PublicationClientChildSbbLocalObject) childRelation.iterator().next();
if(entity.equals(child.getEntity)
{
return child;
}
}
+ SipPublicationClientChildSbbLocalInterface sbb =
(PublicationClientChildSbbLocalObject) childRelation.create();
+ // passes the parent sbb local object to the
child
+ sbb.setParentSbb((PublicationClientParentSbbLocalObject)
sbbContext.getSbbLocalObject());
//else we should search for child.getEntity == null,
but...
- return (SipPublicationClientChildSbbLocalInterface)
childRelation.new();
+ return sbb;
}
}
]]>
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/example/sbb/src/main/java/org/mobicents/slee/enabler/sip/example/PublicationClientParentSbb.java
Tue Dec 28 04:06:40 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/example/sbb/src/main/java/org/mobicents/slee/enabler/sip/example/PublicationClientParentSbb.java
Tue Dec 28 07:25:14 2010
@@ -29,9 +29,9 @@
import javax.slee.facilities.Tracer;
import javax.slee.serviceactivity.ServiceActivity;
-import org.mobicents.slee.enabler.sip.PublicationClientChildLocalObject;
+import org.mobicents.slee.enabler.sip.PublicationClientChildSbbLocalObject;
import org.mobicents.slee.enabler.sip.PublicationClientParent;
-import org.mobicents.slee.enabler.sip.PublicationClientParentLocalObject;
+import
org.mobicents.slee.enabler.sip.PublicationClientParentSbbLocalObject;
import org.mobicents.slee.enabler.sip.PublicationException;
import org.mobicents.slee.enabler.sip.Result;
@@ -109,10 +109,10 @@
public void onStartServiceEvent(
javax.slee.serviceactivity.ServiceStartedEvent event,
ActivityContextInterface aci) {
- PublicationClientChildLocalObject child;
+ PublicationClientChildSbbLocalObject child;
try {
- child =
(PublicationClientChildLocalObject)this.getPublicationClientChildSbbChildRelation().create();
- child.setParentSbb((PublicationClientParentLocalObject)
this.sbbContext.getSbbLocalObject());
+ child =
(PublicationClientChildSbbLocalObject)this.getPublicationClientChildSbbChildRelation().create();
+ child.setParentSbb((PublicationClientParentSbbLocalObject)
this.sbbContext.getSbbLocalObject());
child.newPublication("[email protected]:5090", "presence",
fancyXML, "application", "pidf+xml", 61);
} catch (TransactionRequiredLocalException e) {
// TODO Auto-generated catch block
@@ -138,7 +138,7 @@
ServiceActivity sa = (ServiceActivity)
aci.getActivity();
if(sa.getService().equals(this.sbbContext.getService()))
{
- PublicationClientChildLocalObject child =
(PublicationClientChildLocalObject)this.getPublicationClientChildSbbChildRelation().iterator().next();
+ PublicationClientChildSbbLocalObject child =
(PublicationClientChildSbbLocalObject)this.getPublicationClientChildSbbChildRelation().iterator().next();
try {
child.removePublication();
} catch (PublicationException e) {
@@ -149,7 +149,7 @@
}
}
- public void afterNewPublication(Result result,
PublicationClientChildLocalObject child) {
+ public void afterNewPublication(Result result,
PublicationClientChildSbbLocalObject child) {
tracer.info("GOT AFTER NEW PUB!: "+result);
if(result.getStatusCode()>299)
{
@@ -158,7 +158,7 @@
}
}
- public void afterRefreshPublication(Result result,
PublicationClientChildLocalObject child) {
+ public void afterRefreshPublication(Result result,
PublicationClientChildSbbLocalObject child) {
tracer.info("GOT AFTER REF PUB!: "+result);
if(result.getStatusCode()>299)
@@ -177,7 +177,7 @@
}
}
- public void afterUpdatePublication(Result result,
PublicationClientChildLocalObject child) {
+ public void afterUpdatePublication(Result result,
PublicationClientChildSbbLocalObject child) {
tracer.info("GOT AFTER UPD PUB!: "+result);
if(result.getStatusCode()>299)
{
@@ -187,27 +187,27 @@
}
- public void afterRemovePublication(Result result,
PublicationClientChildLocalObject child) {
+ public void afterRemovePublication(Result result,
PublicationClientChildSbbLocalObject child) {
tracer.info("GOT AFTER REM PUB!: "+result);
child.remove();
}
@Override
- public void newPublicationFailed(PublicationClientChildLocalObject
sbbLocalObject) {
+ public void newPublicationFailed(PublicationClientChildSbbLocalObject
sbbLocalObject) {
tracer.info("GOT NEW PUB FAILURE!");
sbbLocalObject.remove();
}
@Override
- public void refreshPublicationFailed(PublicationClientChildLocalObject
sbbLocalObject) {
+ public void refreshPublicationFailed(PublicationClientChildSbbLocalObject
sbbLocalObject) {
tracer.info("GOT REFRESH PUB FAILURE!");
sbbLocalObject.remove();
}
@Override
- public void removePublicationFailed(PublicationClientChildLocalObject
sbbLocalObject) {
+ public void removePublicationFailed(PublicationClientChildSbbLocalObject
sbbLocalObject) {
tracer.info("GOT REMOVE PUB FAILURE!");
sbbLocalObject.remove();
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/example/sbb/src/main/resources/META-INF/sbb-jar.xml
Fri Dec 17 06:32:44 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/example/sbb/src/main/resources/META-INF/sbb-jar.xml
Tue Dec 28 07:25:14 2010
@@ -35,7 +35,7 @@
</get-child-relation-method>
</sbb-abstract-class>
<sbb-local-interface>
-
<sbb-local-interface-name>org.mobicents.slee.enabler.sip.PublicationClientParentLocalObject</sbb-local-interface-name>
+
<sbb-local-interface-name>org.mobicents.slee.enabler.sip.PublicationClientParentSbbLocalObject</sbb-local-interface-name>
</sbb-local-interface>
</sbb-classes>
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChild.java
Fri Dec 17 06:32:44 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChild.java
Tue Dec 28 07:25:14 2010
@@ -120,6 +120,6 @@
*
* @param parent
*/
- public void setParentSbb(PublicationClientParentLocalObject parent);
+ public void setParentSbb(PublicationClientParentSbbLocalObject parent);
}
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildSbb.java
Tue Dec 28 04:06:40 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientChildSbb.java
Tue Dec 28 07:25:14 2010
@@ -83,7 +83,7 @@
// //////////////////
@Override
- public void setParentSbb(PublicationClientParentLocalObject parent) {
+ public void setParentSbb(PublicationClientParentSbbLocalObject parent) {
setParentSbbCMP(parent);
}
@@ -362,8 +362,8 @@
/////////////////
// CMP Methods //
/////////////////
- public abstract void setParentSbbCMP(PublicationClientParentLocalObject
parent);
- public abstract PublicationClientParentLocalObject getParentSbbCMP();
+ public abstract void
setParentSbbCMP(PublicationClientParentSbbLocalObject parent);
+ public abstract PublicationClientParentSbbLocalObject getParentSbbCMP();
public abstract void setEntityCMP(String d);
public abstract String getEntityCMP();
public abstract void setEventPackageCMP(String eventPackage);
@@ -421,7 +421,7 @@
//update ETag
this.setETagCMP(SIP_ETag.getETag());
try{
- this.getParentSbbCMP().afterNewPublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterNewPublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -438,7 +438,7 @@
//update ETag
this.setETagCMP(SIP_ETag.getETag());
try{
- this.getParentSbbCMP().afterRefreshPublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterRefreshPublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -453,7 +453,7 @@
//update ETag
this.setETagCMP(SIP_ETag.getETag());
try{
- this.getParentSbbCMP().afterUpdatePublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterUpdatePublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -468,7 +468,7 @@
//update ETag
this.setETagCMP(SIP_ETag.getETag());
try{
- this.getParentSbbCMP().afterRemovePublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterRemovePublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -512,7 +512,7 @@
case NEW:
try{
- this.getParentSbbCMP().afterNewPublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterNewPublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -525,7 +525,7 @@
case UPDATE:
//just deliver
try{
- this.getParentSbbCMP().afterUpdatePublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterUpdatePublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -550,7 +550,7 @@
}
try{
- this.getParentSbbCMP().afterRemovePublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterRemovePublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -634,7 +634,7 @@
case NEW:
try {
-
getParentSbbCMP().newPublicationFailed((PublicationClientChildLocalObject)
sbbContext.getSbbLocalObject());
+
getParentSbbCMP().newPublicationFailed((PublicationClientChildSbbLocalObject)
sbbContext.getSbbLocalObject());
} catch (Exception e) {
if (tracer.isSevereEnabled()) {
tracer.severe("Received exception from parent on subscribe callback",
e);
@@ -646,7 +646,7 @@
//failed to refresh, we should get notify when it times
out.
try {
-
getParentSbbCMP().refreshPublicationFailed((PublicationClientChildLocalObject)
sbbContext.getSbbLocalObject());
+
getParentSbbCMP().refreshPublicationFailed((PublicationClientChildSbbLocalObject)
sbbContext.getSbbLocalObject());
} catch (Exception e) {
if (tracer.isSevereEnabled()) {
tracer.severe("Received exception from parent on subscribe callback",
e);
@@ -657,7 +657,7 @@
case REMOVE:
//failed to remove, we will receive notify.
try {
-
getParentSbbCMP().removePublicationFailed((PublicationClientChildLocalObject)
sbbContext.getSbbLocalObject());
+
getParentSbbCMP().removePublicationFailed((PublicationClientChildSbbLocalObject)
sbbContext.getSbbLocalObject());
} catch (Exception e) {
if (tracer.isSevereEnabled()) {
tracer.severe("Received exception from parent on subscribe callback",
e);
@@ -952,7 +952,7 @@
case NEW:
try{
- this.getParentSbbCMP().afterNewPublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterNewPublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -965,7 +965,7 @@
break;
case REFRESH:
try{
- this.getParentSbbCMP().afterRefreshPublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterRefreshPublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -978,7 +978,7 @@
case UPDATE:
try{
- this.getParentSbbCMP().afterUpdatePublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterUpdatePublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
@@ -990,7 +990,7 @@
break;
case REMOVE:
try{
- this.getParentSbbCMP().afterRemovePublication(result,
(PublicationClientChildLocalObject) this.sbbContext.getSbbLocalObject());
+ this.getParentSbbCMP().afterRemovePublication(result,
(PublicationClientChildSbbLocalObject) this.sbbContext.getSbbLocalObject());
}catch(Exception e)
{
if(tracer.isSevereEnabled())
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParent.java
Tue Dec 28 04:06:40 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/java/org/mobicents/slee/enabler/sip/PublicationClientParent.java
Tue Dec 28 07:25:14 2010
@@ -32,43 +32,43 @@
* @param child
* - enabler, which handles publication
*/
- public void afterNewPublication(Result result,
PublicationClientChildLocalObject child);
+ public void afterNewPublication(Result result,
PublicationClientChildSbbLocalObject child);
/**
* Callback indicating state of publication refresh. Its behaviour is
* similar to
- * {...@link #afterNewPublication(Result,
PublicationClientChildLocalObject)}.
+ * {...@link #afterNewPublication(Result,
PublicationClientChildSbbLocalObject)}.
*
* @param result
* - object holding information about operation
* @param child
* - enabler, which handles publication
*/
- public void afterRefreshPublication(Result result,
PublicationClientChildLocalObject child);
+ public void afterRefreshPublication(Result result,
PublicationClientChildSbbLocalObject child);
/**
* Callback method indicating state of publication update. Its behaviour
is
* similar to
- * {...@link #afterNewPublication(Result,
PublicationClientChildLocalObject)}.
+ * {...@link #afterNewPublication(Result,
PublicationClientChildSbbLocalObject)}.
*
* @param result
* - object holding information about operation
* @param child
* - enabler, which handles publication
*/
- public void afterUpdatePublication(Result result,
PublicationClientChildLocalObject child);
+ public void afterUpdatePublication(Result result,
PublicationClientChildSbbLocalObject child);
/**
* Callback method indicating state of publication remove. Its behaviour
is
* similar to
- * {...@link #afterNewPublication(Result,
PublicationClientChildLocalObject)}.
+ * {...@link #afterNewPublication(Result,
PublicationClientChildSbbLocalObject)}.
*
* @param result
* - object holding information about operation
* @param child
* - enabler, which handles publication
*/
- public void afterRemovePublication(Result result,
PublicationClientChildLocalObject child);
+ public void afterRemovePublication(Result result,
PublicationClientChildSbbLocalObject child);
/**
* Callback method indicating that communication failed. Enabler must be
@@ -76,7 +76,7 @@
*
* @param sbbLocalObject
*/
- void newPublicationFailed(PublicationClientChildLocalObject
sbbLocalObject);
+ void newPublicationFailed(PublicationClientChildSbbLocalObject
sbbLocalObject);
/**
* Callback method indicating that communication failed. Enabler must be
@@ -84,7 +84,7 @@
*
* @param sbbLocalObject
*/
- void refreshPublicationFailed(PublicationClientChildLocalObject
sbbLocalObject);
+ void refreshPublicationFailed(PublicationClientChildSbbLocalObject
sbbLocalObject);
/**
* Callback method indicating that communication failed. Enabler must be
@@ -92,6 +92,6 @@
*
* @param sbbLocalObject
*/
- void removePublicationFailed(PublicationClientChildLocalObject
sbbLocalObject);
+ void removePublicationFailed(PublicationClientChildSbbLocalObject
sbbLocalObject);
}
=======================================
---
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/resources/META-INF/sbb-jar.xml
Fri Dec 17 06:32:44 2010
+++
/trunk/servers/jain-slee/enablers/sip-publication-client/sbb/src/main/resources/META-INF/sbb-jar.xml
Tue Dec 28 07:25:14 2010
@@ -34,16 +34,14 @@
<description>Stores entity used in
publication request.</description>
<cmp-field-name>entityCMP</cmp-field-name>
</cmp-field>
-
- <!-- flags to indicate refresh requests -->
<cmp-field>
<description></description>
-
<cmp-field-name>refreshCMP</cmp-field-name>
+
<cmp-field-name>publishRequestTypeCMP</cmp-field-name>
</cmp-field>
</sbb-abstract-class>
<sbb-local-interface>
-
<sbb-local-interface-name>org.mobicents.slee.enabler.sip.PublicationClientChildLocalObject</sbb-local-interface-name>
+
<sbb-local-interface-name>org.mobicents.slee.enabler.sip.PublicationClientChildSbbLocalObject</sbb-local-interface-name>
</sbb-local-interface>
<sbb-activity-context-interface>
<sbb-activity-context-interface-name>
@@ -149,7 +147,7 @@
<description>Used as time difference between expires value and
automatic refresh request.</description>
<env-entry-name>expires.drift</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>5</env-entry-value>
+ <env-entry-value>15</env-entry-value>
</env-entry>
-->
<resource-adaptor-type-binding>