Author: chris.laprun(a)jboss.com Date: 2010-01-19 10:53:42 -0500 (Tue, 19 Jan 2010) New Revision: 1377 Removed: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsole.gtmpl Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpPortlet.java Log: - Removed useless UIWsrpConsole and associated template. Deleted: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java 2010-01-19 15:50:36 UTC (rev 1376) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java 2010-01-19 15:53:42 UTC (rev 1377) @@ -1,47 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.wsrp.webui.component; - -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.core.UIContainer; -import org.exoplatform.webui.core.UITabPane; -import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle; - -@ComponentConfig( - lifecycle = UIApplicationLifecycle.class, - template = "app:/groovy/wsrp/webui/component/UIWsrpConsole.gtmpl" -) -public class UIWsrpConsole extends UIContainer -{ - public UIWsrpConsole() throws Exception - { - UITabPane uiTabPane = addChild(UITabPane.class, null, null); - uiTabPane.addChild(UIWsrpConsumerOverview.class, null, "Manage Consumers"); - uiTabPane.addChild(UIWsrpProducerOverview.class, null, "Producer Configuration"); - - if (uiTabPane.getSelectedTabId().equals("")) - { - uiTabPane.setSelectedTab(1); - } - } -} Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpPortlet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpPortlet.java 2010-01-19 15:50:36 UTC (rev 1376) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpPortlet.java 2010-01-19 15:53:42 UTC (rev 1377) @@ -1,41 +1,48 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.exoplatform.wsrp.webui.component; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.core.UIPortletApplication; +import org.exoplatform.webui.core.UITabPane; import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle; /** @author Wesley Hales */ @ComponentConfig( lifecycle = UIApplicationLifecycle.class ) - public class UIWsrpPortlet extends UIPortletApplication { public UIWsrpPortlet() throws Exception { - addChild(UIWsrpConsole.class, null, null); + UITabPane uiTabPane = addChild(UITabPane.class, null, null); + uiTabPane.addChild(UIWsrpConsumerOverview.class, null, "Manage Consumers"); + uiTabPane.addChild(UIWsrpProducerOverview.class, null, "Producer Configuration"); + + if (uiTabPane.getSelectedTabId().equals("")) + { + uiTabPane.setSelectedTab(1); + } } Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsole.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsole.gtmpl 2010-01-19 15:50:36 UTC (rev 1376) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsole.gtmpl 2010-01-19 15:53:42 UTC (rev 1377) @@ -1,3 +0,0 @@ - - -<% uicomponent.renderChildren(); %>