Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BFE1C0B8 for ; Wed, 20 Jun 2012 16:07:37 +0000 (UTC) Received: (qmail 91853 invoked by uid 500); 20 Jun 2012 16:07:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91813 invoked by uid 500); 20 Jun 2012 16:07:37 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 91804 invoked by uid 99); 20 Jun 2012 16:07:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jun 2012 16:07:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jun 2012 16:07:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 46EE42388CDA; Wed, 20 Jun 2012 16:07:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1352194 - in /geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main: i18n-resources/ java/org/apache/geronimo/console/obrmanager/ webapp/WEB-INF/view/obrmanager/ Date: Wed, 20 Jun 2012 16:07:09 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120620160710.46EE42388CDA@eris.apache.org> Author: gawor Date: Wed Jun 20 16:07:09 2012 New Revision: 1352194 URL: http://svn.apache.org/viewvc?rev=1352194&view=rev Log: GERONIMO-6360: Support for 'obr:deploy' operation and localization improvements Modified: geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/obrmanager/OBRManagerPortlet.java geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/obrmanager/OBRManager.jsp geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/obrmanager/resolve.jsp Modified: geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=1352194&r1=1352193&r2=1352194&view=diff ============================================================================== --- geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties (original) +++ geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties Wed Jun 20 16:07:09 2012 @@ -181,6 +181,7 @@ bundlemanager.normal.symbolicName consolebase.common.JVMVersions = JVM Versions consolebase.common.actions = Actions consolebase.common.alias = Alias +consolebase.common.add = Add consolebase.common.back = Back consolebase.common.cancel = Cancel consolebase.common.commands = Commands @@ -228,6 +229,9 @@ consolebase.common.users = Use consolebase.common.value = Value consolebase.common.version = Version consolebase.common.view = View +consolebase.common.yes = Yes +consolebase.common.no = No +consolebase.common.search = Search infomanager.javaSysHelp.body = This page displays the values of the system properties available to the server process. infomanager.javaSysNormal.etc = Etc @@ -808,3 +812,27 @@ artifact.actions.edit = Edit artifact.actions.save = Save artifact.actions.remove = Remove artifact.msg.emptyText = Empty Text + +obrmanager.versionHeader = Version +obrmanager.symbolicNameHeader = Symbolic Name +obrmanager.requiredHeader = Required +obrmanager.unsatisfiedRequirementHeader = Unsatisfied Requirement +obrmanager.resolveSuccess = All resources resolved successfully +obrmanager.resolvedResources = Resolved resources +obrmanager.dependentResources = Additional dependent resources +obrmanager.resolveFail = One or more resources cannot be resolved +obrmanager.unsatisfiedRequirements = Unsatisfied requirements +obrmanager.resolve = Resolve +obrmanager.selectedHeader = Selected +obrmanager.symbolicNameAndVersionHeader = Symbolic Name and Version +obrmanager.resourceDescription = Description: +obrmanager.resourceCapabilities = Capabilities: +obrmanager.resourceRequirements = Requirements: +obrmanager.searchBy = Search by: +obrmanager.search.symbolicName = Symbolic name +obrmanager.search.resourceName = Resource name +obrmanager.search.packageCapability = Package capability +obrmanager.search.packageRequirement = Package requirement +obrmanager.addRepository = Bundle repository URL: +obrmanager.listAll = List All +obrmanager.bundleRepositoryNameHeader = Bundle Repository Name Modified: geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=1352194&r1=1352193&r2=1352194&view=diff ============================================================================== --- geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties (original) +++ geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties Wed Jun 20 16:07:09 2012 @@ -182,3 +182,6 @@ consolebase.obrmanager.err.actionError consolebase.obrmanager.info.add = OBR repository {0} was successfully added. consolebase.obrmanager.info.removeurl = OBR repository {0} was successfully removed. consolebase.obrmanager.info.refreshurl = OBR repository {0} was successfully refreshed. + +consolebase.obrmanager.info.deploy = Resources were successfully deployed. +consolebase.obrmanager.err.deploy = Error deploying resources. Modified: geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/obrmanager/OBRManagerPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/obrmanager/OBRManagerPortlet.java?rev=1352194&r1=1352193&r2=1352194&view=diff ============================================================================== --- geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/obrmanager/OBRManagerPortlet.java (original) +++ geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/obrmanager/OBRManagerPortlet.java Wed Jun 20 16:07:09 2012 @@ -82,8 +82,12 @@ public class OBRManagerPortlet extends B private static final String ADD_URL_ACTION = "add_url"; private static final String RESOLVE_ACTION = "resolve"; + + private static final String DEPLOY_ACTION = "deploy"; private static final String SEARCH_TYPE_ALL = "ALL"; + + private Map resolverMap = Collections.synchronizedMap(new HashMap()); public void init(PortletConfig portletConfig) throws PortletException { super.init(portletConfig); @@ -141,8 +145,12 @@ public class OBRManagerPortlet extends B actionResponse.setRenderParameter("mode", RESOLVE_ACTION); String[] selectedResources = actionRequest.getParameterValues("selected-resources"); actionResponse.setRenderParameter("selected-resources", selectedResources); - - } + } + else if (DEPLOY_ACTION.equals(action)) { + actionResponse.setRenderParameter("mode", DEPLOY_ACTION); + String resolverId = actionRequest.getParameter("resolverId"); + actionResponse.setRenderParameter("resolverId", resolverId); + } } private void refreshRepository(ActionRequest actionRequest) throws Exception { @@ -240,14 +248,18 @@ public class OBRManagerPortlet extends B if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) { // minimal view return; } else { // normal and maximal view - if (RESOLVE_ACTION.equals(renderRequest.getParameter("mode"))) { - try { + String mode = renderRequest.getParameter("mode"); + try { + if (RESOLVE_ACTION.equals(mode)) { resolveResources(renderRequest, renderResponse); - } catch (Exception e) { - addErrorMessage(renderRequest, getLocalizedString(renderRequest, "consolebase.obrmanager.err.actionError"), e.getMessage()); - logger.error("Exception", e); + return; + } else if (DEPLOY_ACTION.equals(mode)) { + deployResources(renderRequest, renderResponse); + return; } - return; + } catch (Exception e) { + addErrorMessage(renderRequest, getLocalizedString(renderRequest, "consolebase.obrmanager.err.actionError"), e.getMessage()); + logger.error("Exception", e); } BundleContext bundleContext = getBundleContext(renderRequest); @@ -318,8 +330,8 @@ public class OBRManagerPortlet extends B private ResourceMatcher getResourceMatcher(String searchType, String searchString) { if (searchType.equalsIgnoreCase("symbolic-name")) { return new SymbolicNameMatcher(searchString); - } else if (searchType.equalsIgnoreCase("bundle-name")) { - return new BundleNameMatcher(searchString); + } else if (searchType.equalsIgnoreCase("resource-name")) { + return new ResourceNameMatcher(searchString); } else if (searchType.equalsIgnoreCase("package-capability")) { return new PackageCapabilityMatcher(searchString); } else if (searchType.equalsIgnoreCase("package-requirement")) { @@ -360,9 +372,9 @@ public class OBRManagerPortlet extends B } - private static class BundleNameMatcher extends ResourceMatcher { + private static class ResourceNameMatcher extends ResourceMatcher { - public BundleNameMatcher(String query) { + public ResourceNameMatcher(String query) { super(query); } @@ -596,6 +608,9 @@ public class OBRManagerPortlet extends B request.setAttribute("resolved", resolver.resolve()); request.setAttribute("resolver", resolver); + String resolverId = String.valueOf(resolver.hashCode()); + request.setAttribute("resolverId", resolverId); + resolverMap.put(resolverId, resolver); resolveView.include(request, response); } finally { if (reference != null) { @@ -604,6 +619,24 @@ public class OBRManagerPortlet extends B } } + private void deployResources(RenderRequest request, RenderResponse response) throws Exception { + String resolverId = request.getParameter("resolverId"); + + Resolver resolver = resolverMap.get(resolverId); + + try { + resolver.deploy(Resolver.START); + addInfoMessage(request, getLocalizedString(request, "consolebase.obrmanager.info.deploy")); + } catch (Exception e) { + addErrorMessage(request, getLocalizedString(request, "consolebase.obrmanager.err.deploy"), e.getMessage()); + logger.error("Exception", e); + } + + request.setAttribute("resolved", true); + request.setAttribute("resolver", resolver); + resolveView.include(request, response); + } + private BundleContext getBundleContext(PortletRequest request) { return (BundleContext) request.getPortletSession().getPortletContext().getAttribute("osgi-bundlecontext"); } Modified: geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/obrmanager/OBRManager.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/obrmanager/OBRManager.jsp?rev=1352194&r1=1352193&r2=1352194&view=diff ============================================================================== --- geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/obrmanager/OBRManager.jsp (original) +++ geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/obrmanager/OBRManager.jsp Wed Jun 20 16:07:09 2012 @@ -28,9 +28,9 @@
- Add an OBR URL: +   - + " /> @@ -39,8 +39,8 @@ - - + + @@ -69,11 +69,11 @@ @@ -85,23 +85,23 @@
OSGi Bundle Repository NameActions
- Refresh  +   - Remove  +  
- + "/>
- Search type: +     - - + " /> + " onclick="resetSearchForm()" />