Thanks George in advance really. I added the patch as attachment. _lvnd_ (^_^)
On Mon, Dec 27, 2010 at 7:48 PM, George Niculae <[email protected]> wrote: > On Mon, Dec 27, 2010 at 6:55 PM, Levend Sayar <[email protected]> > wrote: > > Yes you are right George. It says > > org.springframework.beans.factory.BeanCreationException: Error creating > bean > > with name 'ugb' defined in class path resource > > [org/sipfoundry/sipxconfig/common/common.beans.xml]: Instantiation of > bean > > failed; nested exception is > > org.springframework.beans.BeanInstantiationException: Could not > instantiate > > bean class [org.sipfoundry.sipxconfig.common.UGB]: Is it an abstract > class?; > > nested exception is java.lang.InstantiationException > > So what is the solution ? > > Can you generate a patch so I can take a look at the implementation? > > George > _______________________________________________ > sipx-dev mailing list > [email protected] > List Archive: http://list.sipfoundry.org/archive/sipx-dev/ >
From bd7ccd20e34fd4affacb853b97055ed1ebc59c91 Mon Sep 17 00:00:00 2001 From: Levend Sayar <[email protected]> Date: Mon, 27 Dec 2010 21:32:00 +0200 Subject: [PATCH] UC-789 Phase 1 --- .../src/org/sipfoundry/sipxconfig/common/UGB.java | 13 ++++++ .../sipfoundry/sipxconfig/common/common.beans.xml | 2 + .../web/context/WEB-INF/admin/ugb/ugbPage.html | 40 ++++++++++++++++++++ .../web/context/WEB-INF/admin/ugb/ugbPage.page | 6 +++ .../context/WEB-INF/admin/ugb/ugbPage.properties | 9 ++++ .../context/WEB-INF/common/AdminNavigation.html | 9 ++++ .../WEB-INF/common/AdminNavigation.properties | 2 + .../WEB-INF/common/AdminNavigation_tr.properties | 2 + .../sipxconfig/site/admin/ugb/ugbPage.java | 30 +++++++++++++++ .../sipxconfig/site/admin/ugb/UGBTestUi.java | 28 ++++++++++++++ 10 files changed, 141 insertions(+), 0 deletions(-) create mode 100755 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/UGB.java mode change 100644 => 100755 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/common.beans.xml create mode 100755 sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.html create mode 100755 sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.page create mode 100755 sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.properties mode change 100644 => 100755 sipXconfig/web/context/WEB-INF/common/AdminNavigation.html mode change 100644 => 100755 sipXconfig/web/context/WEB-INF/common/AdminNavigation.properties mode change 100644 => 100755 sipXconfig/web/context/WEB-INF/common/AdminNavigation_tr.properties create mode 100755 sipXconfig/web/src/org/sipfoundry/sipxconfig/site/admin/ugb/ugbPage.java create mode 100755 sipXconfig/web/test/org/sipfoundry/sipxconfig/site/admin/ugb/UGBTestUi.java diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/UGB.java b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/UGB.java new file mode 100755 index 0000000..a468480 --- /dev/null +++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/UGB.java @@ -0,0 +1,13 @@ +package org.sipfoundry.sipxconfig.common; + +public abstract class UGB { + public String m_data; + + public UGB () { + m_data = "Hello"; + } + + public String getData() { + return m_data; + } +} diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/common.beans.xml b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/common.beans.xml old mode 100644 new mode 100755 index 41a2848..ee17c2b --- a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/common.beans.xml +++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/common/common.beans.xml @@ -96,4 +96,6 @@ <property name="coreContext" ref="coreContext"/> <property name="mailboxManager" ref="mailboxManager"/> </bean> + + <bean id="ugb" class="org.sipfoundry.sipxconfig.common.UGB"/> </beans> diff --git a/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.html b/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.html new file mode 100755 index 0000000..6d39c9a --- /dev/null +++ b/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.html @@ -0,0 +1,40 @@ +<div jwcid="@common/Border" useDojo="true" borderTitle="ognl:borderTitle"> + <span jwcid="@common/TabNavigation" tabNames="ognl:{'ugb', 'users', 'webcm'}" selectedTab="ognl:tab"/> + <div id="settings-content"> + <span jwcid="@common/ErrorMsg"/> + <span jwcid="@RenderBlock" block="ognl:components.get(tab + 'Tab')"/> + </div> + <div jwcid="ugb...@block"> + <span jwcid="@common/QuickHelp" value="message:quick.help.ugbTab" /> + <form jwcid="ugbf...@form" id="ugbForm"> + <table> + <tr jwcid="@common/FieldPanel" for="ugb:serialno" + field="component:serialno" + label="message:ugb.serialno"> + <td jwcid="seria...@textfield" id="ugb:serialno" + value="spring:ugb.getData()" + displayName="message:ugb.serialno"/> + </tr> + <tr jwcid="@common/FieldPanel" for="ugb:version" + field="component:version" + label="message:ugb.version"> + <td jwcid="vers...@textfield" id="ugb:version" + value="ognl:userExtensionPool.lastExtension" + displayName="message:ugb.version"/> + </tr> + </table> + </form> + </div> + <div jwcid="users...@block"> + <span jwcid="@common/QuickHelp" value="message:quick.help.usersTab" /> + <form jwcid="usersf...@form" id="usersForm"> + USERS TAB + </form> + </div> + <div jwcid="webcm...@block"> + <span jwcid="@common/QuickHelp" value="message:quick.help.webcmTab" /> + <form jwcid="webcmf...@form" id="webcmForm"> + WEBCM TAB + </form> + </div> +</div> \ No newline at end of file diff --git a/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.page b/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.page new file mode 100755 index 0000000..9d6c59c --- /dev/null +++ b/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.page @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE page-specification PUBLIC "-//Apache Software Foundation//Tapestry Specification 4.0//EN" + "http://jakarta.apache.org/tapestry/dtd/Tapestry_4_0.dtd";> +<page-specification class="org.sipfoundry.sipxconfig.site.admin.ugb.ugbPage"> + <description>Licensing</description> +</page-specification> \ No newline at end of file diff --git a/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.properties b/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.properties new file mode 100755 index 0000000..26d2a3c --- /dev/null +++ b/sipXconfig/web/context/WEB-INF/admin/ugb/ugbPage.properties @@ -0,0 +1,9 @@ +title=Licensing Page +tab.ugb=UGB +tab.users=Users +tab.webcm=Web-CM +quick.help.ugbTab=UGB serial no and firmware version +quick.help.usersTab=Maximum user count +quick.help.webcmTab=Web-CM support +ugb.serialno=Serial Number +ugb.version=Firmware version \ No newline at end of file diff --git a/sipXconfig/web/context/WEB-INF/common/AdminNavigation.html b/sipXconfig/web/context/WEB-INF/common/AdminNavigation.html old mode 100644 new mode 100755 index 8d07a55..36dce43 --- a/sipXconfig/web/context/WEB-INF/common/AdminNavigation.html +++ b/sipXconfig/web/context/WEB-INF/common/AdminNavigation.html @@ -111,5 +111,14 @@ </ul> </div> </li> + <li> + <div class="roundedMainSectionBoxTopLeft"></div><div class="roundedMainSectionBoxTopRight"></div> + <div class="roundedMainSectionBoxInside"> + <a class="heading"><span key="menu.section.ugbMenu">Licensing</span></a> + <ul> + <li><a jwcid="@PageLink" id="menu.ugbPage" page="admin/ugb/ugbPage"><span key="menu.ugbPage">License Info</span></a></li> + </ul> + </div> + </li> </ul> </div> diff --git a/sipXconfig/web/context/WEB-INF/common/AdminNavigation.properties b/sipXconfig/web/context/WEB-INF/common/AdminNavigation.properties old mode 100644 new mode 100755 index ed9ec7c..a85744b --- a/sipXconfig/web/context/WEB-INF/common/AdminNavigation.properties +++ b/sipXconfig/web/context/WEB-INF/common/AdminNavigation.properties @@ -58,3 +58,5 @@ menu.users=Users menu.tlspeers=TLS Peers menu.authcodes=Authorization Codes menu.openAcd=Call Center +menu.section.ugbMenu=Licensing +menu.ugbPage=License Info diff --git a/sipXconfig/web/context/WEB-INF/common/AdminNavigation_tr.properties b/sipXconfig/web/context/WEB-INF/common/AdminNavigation_tr.properties old mode 100644 new mode 100755 index 9f1b59d..eb428be --- a/sipXconfig/web/context/WEB-INF/common/AdminNavigation_tr.properties +++ b/sipXconfig/web/context/WEB-INF/common/AdminNavigation_tr.properties @@ -58,3 +58,5 @@ menu.uploads=Ayg\u0131t Dosyalar\u0131 menu.userGroups=Kullan\u0131c\u0131 Gruplar\u0131 menu.users=Kullan\u0131c\u0131lar menu.tlspeers=TLS Noktalar\u0131 +menu.section.ugbMenu=Lisanslama +menu.ugbPage=Lisanslama Bilgileri diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/site/admin/ugb/ugbPage.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/site/admin/ugb/ugbPage.java new file mode 100755 index 0000000..eb8d865 --- /dev/null +++ b/sipXconfig/web/src/org/sipfoundry/sipxconfig/site/admin/ugb/ugbPage.java @@ -0,0 +1,30 @@ +package org.sipfoundry.sipxconfig.site.admin.ugb; + +import org.sipfoundry.sipxconfig.components.TapestryUtils; +import org.apache.tapestry.annotations.Bean; +import org.apache.tapestry.annotations.InitialValue; +import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.InjectObject; +import org.sipfoundry.sipxconfig.components.SipxBasePage; +import org.sipfoundry.sipxconfig.components.SipxValidationDelegate; +import org.apache.tapestry.event.PageEvent; +import org.sipfoundry.sipxconfig.common.UGB; + +public abstract class ugbPage extends SipxBasePage { + + @Bean + public abstract SipxValidationDelegate getValidator(); + + @Persist + @InitialValue("literal:first") + public abstract String getTab(); + + @InjectObject(value = "spring:ugb") + public abstract UGB getUGB(); + + public void pageBeginRender(PageEvent event) { + if (!TapestryUtils.isValid(this)) { + return; + } + } +} \ No newline at end of file diff --git a/sipXconfig/web/test/org/sipfoundry/sipxconfig/site/admin/ugb/UGBTestUi.java b/sipXconfig/web/test/org/sipfoundry/sipxconfig/site/admin/ugb/UGBTestUi.java new file mode 100755 index 0000000..9a2194e --- /dev/null +++ b/sipXconfig/web/test/org/sipfoundry/sipxconfig/site/admin/ugb/UGBTestUi.java @@ -0,0 +1,28 @@ +package org.sipfoundry.sipxconfig.site.admin.ugb; + +import junit.framework.Test; + +import net.sourceforge.jwebunit.junit.WebTestCase; + +import org.sipfoundry.sipxconfig.site.SiteTestHelper; + +public class UGBTestUi extends WebTestCase { + public static Test suite() throws Exception { + return SiteTestHelper.webTestSuite(UGBTestUi.class); + } + + @Override + protected void setUp() throws Exception { + getTestContext().setBaseUrl(SiteTestHelper.getBaseUrl()); + SiteTestHelper.home(getTester()); + clickLink("toggleNavigation"); + clickLink("menu.ugbPage"); + } + + public void testDisplay() { + SiteTestHelper.assertNoException(tester); + SiteTestHelper.assertNoUserError(tester); + assertLinkPresent("link:first"); + assertLinkPresent("link:second"); + } +} \ No newline at end of file -- 1.7.2.3
_______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev/
