You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by vv...@apache.org on 2011/09/12 16:45:57 UTC
svn commit: r1169777 [4/4] - in /felix/trunk: webconsole-plugins/deppack/
webconsole-plugins/deppack/src/ webconsole-plugins/deppack/src/main/
webconsole-plugins/deppack/src/main/java/
webconsole-plugins/deppack/src/main/java/org/ webconsole-plugins/de...
Added: felix/trunk/webconsole-plugins/shell/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/LICENSE?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/LICENSE (added)
+++ felix/trunk/webconsole-plugins/shell/LICENSE Mon Sep 12 14:45:53 2011
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: felix/trunk/webconsole-plugins/shell/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/NOTICE?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/NOTICE (added)
+++ felix/trunk/webconsole-plugins/shell/NOTICE Mon Sep 12 14:45:53 2011
@@ -0,0 +1,21 @@
+Apache Felix OSGi Web Console Event Plugin
+Copyright 2007-2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Added: felix/trunk/webconsole-plugins/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/pom.xml?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/pom.xml (added)
+++ felix/trunk/webconsole-plugins/shell/pom.xml Mon Sep 12 14:45:53 2011
@@ -0,0 +1,114 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<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>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.felix.webconsole.plugins.shell</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <name>Apache Felix Web Console Shell Plugin</name>
+ <description>
+ This is a plugin for the Apache Felix OSGi web console that provides access to shell/console commands.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/shell</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/shell</developerConnection>
+ <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <!-- translate UTF-8 encoded properties files to ISO-8859-1 -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>native2ascii-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>native2ascii</goal>
+ </goals>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${artifactId}
+ </Bundle-SymbolicName>
+ <Bundle-Activator>
+ org.apache.felix.webconsole.plugins.shell.internal.Activator
+ </Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: felix/trunk/webconsole-plugins/shell/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/Activator.java?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/Activator.java (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/Activator.java Mon Sep 12 14:45:53 2011
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.webconsole.plugins.shell.internal;
+
+import org.apache.felix.shell.ShellService;
+import org.apache.felix.webconsole.SimpleWebConsolePlugin;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+/**
+ * Activator is the main starting class.
+ */
+public class Activator implements BundleActivator, ServiceTrackerCustomizer
+{
+
+ private ServiceTracker tracker;
+ private BundleContext context;
+
+ private SimpleWebConsolePlugin plugin;
+
+ /**
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public final void start(BundleContext context) throws Exception
+ {
+ this.context = context;
+ this.tracker = new ServiceTracker(context, ShellService.class.getName(), this);
+ this.tracker.open();
+ }
+
+ /**
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public final void stop(BundleContext context) throws Exception
+ {
+ if (tracker != null)
+ {
+ tracker.close();
+ tracker = null;
+ }
+ }
+
+ // - begin tracker
+ /**
+ * @see org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(org.osgi.framework.ServiceReference,
+ * java.lang.Object)
+ */
+ public final void modifiedService(ServiceReference reference, Object service)
+ {/* unused */
+ }
+
+ /**
+ * @see org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(org.osgi.framework.ServiceReference)
+ */
+ public final Object addingService(ServiceReference reference)
+ {
+ SimpleWebConsolePlugin plugin = this.plugin;
+ if (plugin == null)
+ {
+ this.plugin = plugin = new WebConsolePlugin(tracker).register(context);
+ }
+
+ return context.getService(reference);
+ }
+
+ /**
+ * @see org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(org.osgi.framework.ServiceReference,
+ * java.lang.Object)
+ */
+ public final void removedService(ServiceReference reference, Object service)
+ {
+ SimpleWebConsolePlugin plugin = this.plugin;
+
+ if (tracker.getTrackingCount() == 0 && plugin != null)
+ {
+ plugin.unregister();
+ this.plugin = null;
+ }
+
+ }
+}
Propchange: felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/Activator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/WebConsolePlugin.java?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/WebConsolePlugin.java (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/WebConsolePlugin.java Mon Sep 12 14:45:53 2011
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.webconsole.plugins.shell.internal;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.felix.shell.ShellService;
+import org.apache.felix.webconsole.DefaultVariableResolver;
+import org.apache.felix.webconsole.SimpleWebConsolePlugin;
+import org.apache.felix.webconsole.WebConsoleUtil;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * ShellServlet provides a Web bases interface to the Apache shell service, allowing
+ * the user to execute shell commands from the browser.
+ */
+class WebConsolePlugin extends SimpleWebConsolePlugin
+{
+
+ private static final String LABEL = "shell"; //$NON-NLS-1$
+ private static final String TITLE = "%shell.pluginTitle"; //$NON-NLS-1$
+ private static final String CSS[] = { "/" + LABEL + "/res/plugin.css" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+ private final ServiceTracker tracker;
+
+ // templates
+ private final String TEMPLATE;
+
+ WebConsolePlugin(ServiceTracker tracker)
+ {
+ super(LABEL, TITLE, CSS);
+
+ // load templates
+ TEMPLATE = readTemplateFile("/res/plugin.html"); //$NON-NLS-1$
+ this.tracker = tracker;
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException
+ {
+ response.setCharacterEncoding("utf-8"); //$NON-NLS-1$
+ response.setContentType("text/html"); //$NON-NLS-1$
+
+ PrintWriter pw = response.getWriter();
+
+ try
+ {
+ String command = request.getParameter("command"); //$NON-NLS-1$
+ if (command != null)
+ {
+ command = WebConsoleUtil.urlDecode(command);
+ }
+
+ pw.print("<span class=\"consolecommand\">-> "); //$NON-NLS-1$
+ pw.print(command == null ? "" : WebConsoleUtil.escapeHtml(command)); //$NON-NLS-1$
+ pw.println("</span><br />"); //$NON-NLS-1$
+
+ if (command != null && command.length() > 0)
+ {
+ ShellService shellService = getShellService();
+ if (shellService != null)
+ {
+ ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
+ ByteArrayOutputStream baosErr = new ByteArrayOutputStream();
+
+ shellService.executeCommand(command, new PrintStream(baosOut, true),
+ new PrintStream(baosErr, true));
+ if (baosOut.size() > 0)
+ {
+ pw.print(WebConsoleUtil.escapeHtml(new String(
+ baosOut.toByteArray())));
+ }
+ if (baosErr.size() > 0)
+ {
+ pw.print("<span class=\"error\">"); //$NON-NLS-1$
+ pw.print(WebConsoleUtil.escapeHtml(new String(
+ baosErr.toByteArray())));
+ pw.println("</span>"); //$NON-NLS-1$
+ }
+ }
+ else
+ {
+ pw.print("<span class=\"error\">"); //$NON-NLS-1$
+ pw.print("Error: No shell service available<br />");
+ pw.println("</span>"); //$NON-NLS-1$
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ pw.print("<span class=\"error\">"); //$NON-NLS-1$
+ StringWriter out = new StringWriter();
+ t.printStackTrace(new PrintWriter(out, true));
+ pw.print(WebConsoleUtil.escapeHtml(out.toString()));
+ pw.println("</span>"); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * @see org.apache.felix.webconsole.AbstractWebConsolePlugin#renderContent(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ */
+ protected void renderContent(HttpServletRequest request, HttpServletResponse response)
+ throws IOException
+ {
+ DefaultVariableResolver vr = (DefaultVariableResolver) WebConsoleUtil.getVariableResolver(request);
+ if (getShellService() == null)
+ {
+ vr.put("shell.status", "Shell Service not available"); //$NON-NLS-1$
+ vr.put("shell.disabled", "true"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ else
+ {
+ vr.put("shell.disabled", "false"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ response.getWriter().print(TEMPLATE);
+ }
+
+ private final ShellService getShellService()
+ {
+ return (ShellService) tracker.getService();
+ }
+
+}
Propchange: felix/trunk/webconsole-plugins/shell/src/main/java/org/apache/felix/webconsole/plugins/shell/internal/WebConsolePlugin.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties Mon Sep 12 14:45:53 2011
@@ -0,0 +1,33 @@
+#Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Web Console strings for reference all strings here are commented.
+# This file may be used to produce a translation of the strings
+#
+# Note that properties files are ISO-8859-1 encoded. To provide translations
+# for languages requiring different character encodings, you may use the
+# native2ascii Maven Plugin from http://mojo.codehaus.org/native2ascii-maven-plugin/
+# to translate the natively encoded files to ISO-8859-1 during bundle build
+#
+# Translations requiring non-ISO-8859-1 encoding are placed in the
+# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
+# plugin while building the bundle
+# native2ascii -encoding utf-8 bundle_bg.raw_properties bundle_bg.properties
+
+# Shell plugin
+shell.pluginTitle=Ðонзола
+shell.clear=ÐзÑиÑÑване
+shell.status=ÐзползвайÑе командниÑÑ Ñед за изпÑлнение на команди.
Propchange: felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties Mon Sep 12 14:45:53 2011
@@ -0,0 +1,33 @@
+#Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Web Console strings for reference all strings here are commented.
+# This file may be used to produce a translation of the strings
+#
+# Note that properties files are ISO-8859-1 encoded. To provide translations
+# for languages requiring different character encodings, you may use the
+# native2ascii Maven Plugin from http://mojo.codehaus.org/native2ascii-maven-plugin/
+# to translate the natively encoded files to ISO-8859-1 during bundle build
+#
+# Translations requiring non-ISO-8859-1 encoding are placed in the
+# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
+# plugin while building the bundle
+#
+
+# Shell plugin
+shell.pluginTitle=Shell
+shell.clear=Löschen
+shell.status=Nutzen Sie das Eingabefeld um Shell Kommandos auszuführen.
Propchange: felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties Mon Sep 12 14:45:53 2011
@@ -0,0 +1,33 @@
+#Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Web Console strings for reference all strings here are commented.
+# This file may be used to produce a translation of the strings
+#
+# Note that properties files are ISO-8859-1 encoded. To provide translations
+# for languages requiring different character encodings, you may use the
+# native2ascii Maven Plugin from http://mojo.codehaus.org/native2ascii-maven-plugin/
+# to translate the natively encoded files to ISO-8859-1 during bundle build
+#
+# Translations requiring non-ISO-8859-1 encoding are placed in the
+# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
+# plugin while building the bundle
+#
+
+# Shell plugin
+shell.pluginTitle=ÐонÑолÑ
+shell.clear=ÐÑиÑÑиÑÑ
+shell.status=ÐÑполÑзÑйÑе ÑÑÑÐ¾ÐºÑ Ð²Ð²Ð¾Ð´Ð° Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ в конÑоли.
Propchange: felix/trunk/webconsole-plugins/shell/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/resources/OSGI-INF/l10n/bundle.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/resources/OSGI-INF/l10n/bundle.properties (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/resources/OSGI-INF/l10n/bundle.properties Mon Sep 12 14:45:53 2011
@@ -0,0 +1,33 @@
+#Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Web Console strings for reference all strings here are commented.
+# This file may be used to produce a translation of the strings
+#
+# Note that properties files are ISO-8859-1 encoded. To provide translations
+# for languages requiring different character encodings, you may use the
+# native2ascii Maven Plugin from http://mojo.codehaus.org/native2ascii-maven-plugin/
+# to translate the natively encoded files to ISO-8859-1 during bundle build
+#
+# Translations requiring non-ISO-8859-1 encoding are placed in the
+# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
+# plugin while building the bundle
+#
+
+# Shell plugin
+shell.pluginTitle=Shell
+shell.clear=Clear
+shell.status=Use the command prompt to execute shell commands.
Propchange: felix/trunk/webconsole-plugins/shell/src/main/resources/OSGI-INF/l10n/bundle.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.css
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.css?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.css (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.css Mon Sep 12 14:45:53 2011
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#consoleframe {
+ font-family: monospace;
+ background-color: #f0f0f0;
+ height: 500px;
+ overflow: auto;
+}
+
+span.consolecommand {
+ white-space: pre;
+ font-weight: bold;
+}
+
+span.error {
+ color: #ff0000;
+}
+
+input.command {
+ font-family: monospace;
+ width: 80%;
+}
Propchange: felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.css
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.html?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.html (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.html Mon Sep 12 14:45:53 2011
@@ -0,0 +1,27 @@
+<script type="text/javascript" src="${pluginRoot}/res/plugin.js"></script>
+<script type="text/javascript">
+// <![CDATA[
+var shellDisabled = ${shell.disabled};
+// ]]>
+</script>
+<p class="statline">${shell.status}</p>
+
+<form id="shell_form" method="post" action="${pluginRoot}">
+ <!-- top header -->
+ <div class="ui-widget-header ui-corner-top buttonGroup">
+ <input id="help" value="${help}" type="button" />
+ <input id="clear" value="${shell.clear}" type="button" />
+ </div>
+
+ <!-- the console window -->
+ <div id="consoleframe">
+ <div id="console">
+ <!-- HERE COMES CONSOLE CONTENTS -->
+ </div><!-- console -->
+ </div><!-- consoleframe -->
+
+ <!-- bottom header -->
+ <div class="ui-widget-header ui-corner-bottom buttonGroup" style="text-align: left">
+ -> <input id="command" name="command" class="command" autocomplete="off" type="text" />
+ </div>
+</form>
Propchange: felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.js?rev=1169777&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.js (added)
+++ felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.js Mon Sep 12 14:45:53 2011
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// elements cache
+var consoleframe = false;
+var konsole = false;
+var command = false;
+
+function executeCommand(cmd) {
+ $.post(document.location.href, { 'command' : encodeURIComponent(cmd) },
+ function(result) {
+ konsole.removeClass('ui-helper-hidden').append(result);
+ consoleframe.attr('scrollTop', konsole.attr('scrollHeight'));
+ command.val('');
+ shellCommandFocus();
+ }, 'html');
+}
+
+function shellCommandFocus() { command.focus() }
+
+// automatically executed on load
+$(document).ready(function(){
+
+ // disable the shell form if the shell service is not available
+ if (shellDisabled) {
+
+ $('#shell_form').hide();
+
+ } else {
+
+ // init cache
+ consoleframe = $('#consoleframe').click(shellCommandFocus);
+ konsole = $('#console');
+ command = $('#command').focus();
+
+ // attach action handlers
+ $('#clear').click(function() {
+ konsole.addClass('ui-helper-hidden').html('');
+ consoleframe.attr('scrollTop', 0);
+ shellCommandFocus();
+ });
+ $('#help').click(function() {
+ executeCommand('help');
+ });
+ $('form').submit(function() {
+ executeCommand(command.val());
+ return false;
+ });
+
+ }
+});
Propchange: felix/trunk/webconsole-plugins/shell/src/main/resources/res/plugin.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?rev=1169777&r1=1169776&r2=1169777&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java Mon Sep 12 14:45:53 2011
@@ -121,7 +121,6 @@ public class OsgiManager extends Generic
static final String DEFAULT_MANAGER_ROOT = "/system/console"; //$NON-NLS-1$
static final String[] PLUGIN_CLASSES = {
- "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter", //$NON-NLS-1$
"org.apache.felix.webconsole.internal.compendium.ConfigurationAdminConfigurationPrinter", //$NON-NLS-1$
"org.apache.felix.webconsole.internal.compendium.PreferencesConfigurationPrinter", //$NON-NLS-1$
"org.apache.felix.webconsole.internal.compendium.WireAdminConfigurationPrinter", //$NON-NLS-1$
@@ -132,15 +131,11 @@ public class OsgiManager extends Generic
"org.apache.felix.webconsole.internal.misc.ThreadPrinter", }; //$NON-NLS-1$
static final String[] PLUGIN_MAP = {
- "org.apache.felix.webconsole.internal.compendium.ComponentsServlet", "components", //$NON-NLS-1$ //$NON-NLS-2$
"org.apache.felix.webconsole.internal.compendium.ConfigManager", "configMgr", //$NON-NLS-1$ //$NON-NLS-2$
"org.apache.felix.webconsole.internal.compendium.LogServlet", "logs", //$NON-NLS-1$ //$NON-NLS-2$
"org.apache.felix.webconsole.internal.core.BundlesServlet", "bundles", //$NON-NLS-1$ //$NON-NLS-2$
"org.apache.felix.webconsole.internal.core.ServicesServlet", "services", //$NON-NLS-1$ //$NON-NLS-2$
- "org.apache.felix.webconsole.internal.deppack.DepPackServlet", "deppack", //$NON-NLS-1$ //$NON-NLS-2$
"org.apache.felix.webconsole.internal.misc.LicenseServlet", "licenses", //$NON-NLS-1$ //$NON-NLS-2$
- "org.apache.felix.webconsole.internal.misc.ShellServlet", "shell", //$NON-NLS-1$ //$NON-NLS-2$
- "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender", "obr", //$NON-NLS-1$ //$NON-NLS-2$
"org.apache.felix.webconsole.internal.system.VMStatPlugin", "vmstat", //$NON-NLS-1$ //$NON-NLS-2$
};
Modified: felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties?rev=1169777&r1=1169776&r2=1169777&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties [UTF-8] Mon Sep 12 14:45:53 2011
@@ -94,23 +94,6 @@ log.level.warn=ПРЕДУПР
log.level.info=ИНФО
log.level.debug=ДЕТАЙЛИ
-# Deployment Admin plugin
-deppack.pluginTitle=Управление на пакети
-deployment.status.no_data=Няма инсталирани пакети!
-deployment.status.no_service=Услугата Deployment Admin не е налична в момента!
-deployment.status.ok=Deployment Admin е наличен и по-долу е показан списъка с пакет
-deployment.details=Детайли
-deployment.actions=Действия
-deployment.install_update=Инсталиране/обновяване
-deployment.package.name=Име на пакет
-deployment.bundles=Бъндъли
-deployment.uninstall=Премахване
-
-# Shell plugin
-shell.pluginTitle=Конзола
-shell.clear=Изчистване
-shell.status=Използвайте командният ред за изпълнение на команди.
-
# Bundles plugin
bundles.pluginTitle=Бъндъли
bundles.statline=Информация за бъндълите: {0} бъндъли общо, {1} активни, {2} активни фрагменти, {3} resolved, {4} инсталирани.
@@ -164,28 +147,6 @@ bundles.state.fragment=Фрагмент
bundles.error.title=Грешка при изпълнение на операцията!
-# Components plugin
-components.pluginTitle=Компоненти
-scr.status.no_service=Declarative Service не е наличен!
-scr.status.no_components=Няма инсталирани компонент в момента!
-scr.status.ok=Брой инсталирани компоненти: {0}
-scr.action.enable=Enable
-scr.action.disable=Disable
-scr.action.configure=Конфигуриране
-scr.prop.bundle=Бъндъл
-scr.prop.defstate=Статус по подразбиране
-scr.prop.activation=Активация
-scr.prop.properties=Конфигурации
-scr.prop.class=Implementation Class
-scr.prop.componentfactory=Component Factory име
-scr.prop.configurationpolicy=Конфигурационна политика
-scr.serv.type=Тип на услугата
-scr.serv=Услуги
-scr.title.actions=Действия
-scr.title.status=Статус
-scr.title.name=Име
-
-
# Configuration plugin
configMgr.pluginTitle=Конфигурации
config.status.ok=Configuration Admin Service е достъпен.
@@ -219,27 +180,6 @@ license.status.none=Няма бъндъ�
license.resources=Ресурси на бъндъла:
license.resources.embedded=Вградени ресурси от {0}:
-# OBR Plugin
-obr.pluginTitle=OSGi Хранилище
-obr.status.ok=Apache Bundle Repository услъгата е достъпна.
-obr.status.no=Нуждаете се от Apache Bundle Repository услугата за да се възползвате от тази функционалност!
-obr.version.select=Изберете версия...
-obr.repo.title=Бъндъл хранилище
-obr.action.add=Добавяне
-obr.action.search=Търсене
-obr.action.search.description=Въведе част от презентацията на бъндъла (име, описание, версия ...), \
- или валиден OSGi филтър
-obr.action.deploy=Инсталиране на избраните
-obr.action.deploystart=Инсталиране и стартиране на избраните
-obr.repo.name=Име
-obr.repo.url=Адрес
-obr.repo.lastModified=Последна промяна
-obr.repo.actions=Действия
-obr.res.title=Достъпни ресурси
-obr.res.name=Име на ресурса
-obr.res.installedVer=Инсталирана версия
-obr.error=Грешка при филтриране на ресурсите
-
# Configuration Status plugin
configStatus.pluginTitle=Конфиг. статус
configStatus.wait=Моля изчакайте...
Modified: felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties?rev=1169777&r1=1169776&r2=1169777&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_de.properties [UTF-8] Mon Sep 12 14:45:53 2011
@@ -93,23 +93,6 @@ log.level.warn=Warnungen
log.level.info=Informationen
log.level.debug=Debug
-# Deployment Admin plugin
-deppack.pluginTitle=Deployment Packages
-deployment.status.no_data=Kein Deployment Package ist installiert!
-deployment.status.no_service=Deployment Admin Dienst ist nicht instaliert/aktiv!
-deployment.status.ok=Deployment Admin Dienst ist aktiv
-deployment.details=Details
-deployment.actions=Aktionen
-deployment.install_update=Installieren oder Aktualisieren
-deployment.package.name=Package Name
-deployment.bundles=Bundles
-deployment.uninstall=Deinstallieren
-
-# Shell plugin
-shell.pluginTitle=Shell
-shell.clear=Löschen
-shell.status=Nutzen Sie das Eingabefeld um Shell Kommandos auszuführen.
-
# Bundles plugin
bundles.pluginTitle=Bundles
bundles.statline=Bundle information: {0} Bundles total, {1} aktive Bundles, {2} aktive Fragmente, {3} aufgelöste Bundles, {4} installierte Bundles.
@@ -162,27 +145,6 @@ bundles.state.fragment=Fragment
# action error
bundles.error.title=Ein Fehler ist aufgetreten während der Ausführung der Bundle Operation!
-# Components plugin
-components.pluginTitle=Komponenten
-scr.status.no_service=Declarative Service ist Voraussetzung für diese Funktionalität!
-scr.status.no_components=Zur Zeit sind keine Komponenten installiert!
-scr.status.ok=Anzahl installierter Komponenten: {0}
-scr.action.enable=Aktivieren
-scr.action.disable=Deaktivieren
-scr.action.configure=Konfigurieren
-scr.prop.bundle=Bundle
-scr.prop.defstate=Default Status
-scr.prop.activation=Aktivierung
-scr.prop.properties=Eigenschaften
-scr.prop.class=Implementationsklasse
-scr.prop.componentfactory=Komponenten Factory Name
-scr.prop.configurationpolicy=Konfigurations Policy
-scr.serv.type=Dienst Typ
-scr.serv=Dienste
-scr.title.actions=Aktionen
-scr.title.status=Status
-scr.title.name=Name
-
# Configuration plugin
configMgr.pluginTitle=Konfiguration
@@ -216,28 +178,6 @@ license.status.none=Keine Bundles mit Li
license.resources=Bundle Resourcen:
license.resources.embedded=Eingebettet {0}:
-# OBR Plugin
-obr.pluginTitle=OSGi Repository
-obr.status.ok=Der Apache Bundle Repository Service ist aktiv und bereit.
-obr.status.no=Der Apache Bundle Repository Service ist nicht aktiv!
-obr.version.select=Wähle Version...
-obr.repo.title=Bundle Repositories
-obr.action.add=Hinzufügen
-obr.action.search=Suchen
-obr.action.search.description=Geben Sie einen Teil des Präsentations- oder \
- symoblischen Namens der gesuchten Bundles oder einen gültigen OSGi \
- Filter Ausdruck
-obr.action.deploy=Ausgewählte Installieren
-obr.action.deploystart=Ausgewählte Installieren und Starten
-obr.repo.name=Name
-obr.repo.url=URL
-obr.repo.lastModified=Letzte Änderung
-obr.repo.actions=Aktionen
-obr.res.title=Verfügbare Resourcen
-obr.res.name=Resource Name
-obr.res.installedVer=Installierte Version
-obr.error=Fehler bei der Auswahl der Resourcen
-
# Configuration Status plugin
configStatus.pluginTitle=Configuration Status
configStatus.wait=Bitte warten...
Modified: felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties?rev=1169777&r1=1169776&r2=1169777&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties (original)
+++ felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_ru.properties Mon Sep 12 14:45:53 2011
@@ -62,23 +62,6 @@ log.level.warn=ÐÐ ÐÐУÐ�
log.level.info=ÐÐФÐ
log.level.debug=ÐТÐÐÐÐÐ
-# Deployment Admin plugin
-deppack.pluginTitle=УпÑавление пакеÑами
-deployment.status.no_data=ÐÐµÑ ÑÑÑановоÑнÑÑ
пакеÑов!
-deployment.status.no_service=СеÑÐ²Ð¸Ñ Deployment Admin не ÑÑÑановлен или не запÑÑен.
-deployment.status.ok=СеÑÐ²Ð¸Ñ Deployment Admin ÑабоÑаеÑ
-deployment.details=ÐодÑобно
-deployment.actions=ÐейÑÑвиÑ
-deployment.install_update=УÑÑановиÑÑ/обновиÑÑ
-deployment.package.name=ÐÐ¼Ñ Ð¿Ð°ÐºÐµÑа
-deployment.bundles=ÐодÑли
-deployment.uninstall=УдалиÑÑ
-
-# Shell plugin
-shell.pluginTitle=ÐонÑолÑ
-shell.clear=ÐÑиÑÑиÑÑ
-shell.status=ÐÑполÑзÑйÑе ÑÑÑÐ¾ÐºÑ Ð²Ð²Ð¾Ð´Ð° Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ в конÑоли.
-
# Bundles plugin
bundles.pluginTitle=ÐодÑли
bundles.statline=ÐнÑоÑмаÑÐ¸Ñ Ð¾ модÑлÑÑ
: модÑлей вÑего {0}, акÑивнÑÑ
{1}, акÑивнÑÑ
ÑÑагменÑов {2}, ÑазÑеÑеннÑÑ
{3}, ÑÑÑановленнÑÑ
{4}.
@@ -132,28 +115,6 @@ bundles.state.fragment=ФÑаг�
bundles.error.title=ÐÑибка пÑи вÑполнении дейÑÑÐ²Ð¸Ñ Ð½Ð°Ð´ модÑлем!
-# Components plugin
-components.pluginTitle=ÐомпоненÑÑ
-scr.status.no_service=СеÑÐ²Ð¸Ñ Declarative Service не найден!
-scr.status.no_components=ÐÐµÑ ÑÑÑановленнÑÑ
компоненÑов!
-scr.status.ok=ÐолиÑеÑÑво ÑÑÑановленнÑÑ
компоненÑов: {0}
-scr.action.enable=ÐклÑÑиÑÑ
-scr.action.disable=ÐÑклÑÑиÑÑ
-scr.action.configure=ÐонÑигÑÑиÑоваÑÑ
-scr.prop.bundle=ÐодÑлÑ
-scr.prop.defstate=СоÑÑоÑние по ÑмолÑаниÑ
-scr.prop.activation=ÐкÑиваÑиÑ
-scr.prop.properties=ÐонÑигÑÑаÑии
-scr.prop.class=ÐлаÑÑ ÑеализаÑии
-scr.prop.componentfactory=ÐÐ¼Ñ ÑабÑики компоненÑов
-scr.prop.configurationpolicy=ÐолиÑика конÑигÑÑиÑованиÑ
-scr.serv.type=Тип ÑеÑвиÑа
-scr.serv=СеÑвиÑÑ
-scr.title.actions=ÐейÑÑвиÑ
-scr.title.status=СоÑÑоÑние
-scr.title.name=ÐмÑ
-
-
# Configuration plugin
configMgr.pluginTitle=ÐонÑигÑÑиÑование
config.status.ok=СеÑÐ²Ð¸Ñ Configuration Admin запÑÑен.
@@ -187,27 +148,6 @@ license.status.none=ÐÐµÑ Ð¼Ð�
license.resources=РеÑÑÑÑÑ Ð¼Ð¾Ð´ÑлÑ:
license.resources.embedded=ÐÑÑÑоеннÑе лиÑензии {0}:
-# OBR Plugin
-obr.pluginTitle=Ð¥ÑанилиÑе OSGi
-obr.status.ok=СеÑÐ²Ð¸Ñ Apache Bundle Repository запÑÑен и ÑабоÑаеÑ.
-obr.status.no=СеÑÐ²Ð¸Ñ Apache Bundle Repository не найден!
-obr.version.select=ÐÑбеÑиÑе веÑÑиÑ...
-obr.repo.title=Ð¥ÑанилиÑе модÑлей
-obr.action.add=ÐобавиÑÑ
-obr.action.search=ÐоиÑк
-obr.action.search.description=ÐведиÑе Ñлово, ÑодеÑжаÑееÑÑ Ð² опиÑании модÑÐ»Ñ (или в имени, веÑÑии и Ñ. д.) \
- или пÑавилÑнÑй OSGi ÑилÑÑÑ
-obr.action.deploy=УÑÑановиÑÑ Ð²ÑбÑанное
-obr.action.deploystart=УÑÑановиÑÑ Ð¸ запÑÑÑиÑÑ Ð²ÑбÑанное
-obr.repo.name=ÐмÑ
-obr.repo.url=ÐдÑеÑ
-obr.repo.lastModified=ÐоÑледнее изменение
-obr.repo.actions=ÐейÑÑвиÑ
-obr.res.title=ÐоÑÑÑпнÑе ÑеÑÑÑÑÑ
-obr.res.name=ÐÐ¼Ñ ÑеÑÑÑÑа
-obr.res.installedVer=УÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑÑиÑ
-obr.error=ÐÑибка ÑилÑÑÑаÑии ÑеÑÑÑÑов
-
# Configuration Status plugin
configStatus.pluginTitle=Ð¡Ð²Ð¾Ð´Ð½Ð°Ñ Ð¸Ð½ÑоÑмаÑиÑ
configStatus.wait=ÐожалÑйÑÑа, подождиÑе...
Modified: felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1169777&r1=1169776&r2=1169777&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties (original)
+++ felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties Mon Sep 12 14:45:53 2011
@@ -94,23 +94,6 @@ log.level.warn=WARN
log.level.info=INFO
log.level.debug=DEBUG
-# Deployment Admin plugin
-deppack.pluginTitle=Deployment Packages
-deployment.status.no_data=No deployment packages installed!
-deployment.status.no_service=Deployment Admin is not installed/running!
-deployment.status.ok=Deployment Admin service is running
-deployment.details=Details
-deployment.actions=Actions
-deployment.install_update=Install or Update
-deployment.package.name=Package Name
-deployment.bundles=Bundles
-deployment.uninstall=Uninstall
-
-# Shell plugin
-shell.pluginTitle=Shell
-shell.clear=Clear
-shell.status=Use the command prompt to execute shell commands.
-
# Bundles plugin
bundles.pluginTitle=Bundles
bundles.statline=Bundle information: {0} bundles in total, {1} bundles active, {2} active fragments, {3} bundles resolved, {4} bundles installed.
@@ -164,28 +147,6 @@ bundles.state.fragment=Fragment
bundles.error.title=Error while executing bundle operation!
-# Components plugin
-components.pluginTitle=Components
-scr.status.no_service=Declarative Service required for this function!
-scr.status.no_components=No components installed currently!
-scr.status.ok=Number of installed components: {0}
-scr.action.enable=Enable
-scr.action.disable=Disable
-scr.action.configure=Configure
-scr.prop.bundle=Bundle
-scr.prop.defstate=Default State
-scr.prop.activation=Activation
-scr.prop.properties=Properties
-scr.prop.class=Implementation Class
-scr.prop.componentfactory=Component Factory Name
-scr.prop.configurationpolicy=Configuration Policy
-scr.serv.type=Service Type
-scr.serv=Services
-scr.title.actions=Actions
-scr.title.status=Status
-scr.title.name=Name
-
-
# Configuration plugin
configMgr.pluginTitle=Configuration
config.status.ok=Configuration Admin Service is running.
@@ -219,27 +180,6 @@ license.status.none=No bundles with lice
license.resources=Bundle Resources:
license.resources.embedded=Embedded {0}:
-# OBR Plugin
-obr.pluginTitle=OSGi Repository
-obr.status.ok=The Apache Bundle Repository service is up and running.
-obr.status.no=The Apache Bundle Repository service is not available!
-obr.version.select=Select Version...
-obr.repo.title=Bundle Repositories
-obr.action.add=Add
-obr.action.search=Search
-obr.action.search.description=Enter word contained in bundle presentation \
- and/or symbolic name or a valid OSGi Filter Expression
-obr.action.deploy=Deploy Selected
-obr.action.deploystart=Deploy and Start Selected
-obr.repo.name=Name
-obr.repo.url=URL
-obr.repo.lastModified=Last Modified
-obr.repo.actions=Actions
-obr.res.title=Available Resources
-obr.res.name=Resource Name
-obr.res.installedVer=Installed Version
-obr.error=Error Filtering Resources
-
# Configuration Status plugin
configStatus.pluginTitle=Configuration Status
configStatus.wait=Please wait...