Author: [email protected]
Date: Wed Jun 13 15:07:12 2012
New Revision: 2491
Log:
[AMDATUAUTH-167] Merged shellcommands back from 0.3.0 to 0.2.3
Added:
branches/amdatu-auth-0.2.3/tools/shellcommands/
branches/amdatu-auth-0.2.3/tools/shellcommands/.checkstyle
branches/amdatu-auth-0.2.3/tools/shellcommands/LICENSE
branches/amdatu-auth-0.2.3/tools/shellcommands/NOTICE
branches/amdatu-auth-0.2.3/tools/shellcommands/pom.xml
branches/amdatu-auth-0.2.3/tools/shellcommands/src/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/osgi/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/osgi/Activator.java
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/service/
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/service/OrderedPsCommandImpl.java
Modified:
branches/amdatu-auth-0.2.3/pom.xml
branches/amdatu-auth-0.2.3/release-demo/pom.xml
branches/amdatu-auth-0.2.3/tools/pom.xml
Modified: branches/amdatu-auth-0.2.3/pom.xml
==============================================================================
--- branches/amdatu-auth-0.2.3/pom.xml (original)
+++ branches/amdatu-auth-0.2.3/pom.xml Wed Jun 13 15:07:12 2012
@@ -196,6 +196,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.shellcommands</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
Modified: branches/amdatu-auth-0.2.3/release-demo/pom.xml
==============================================================================
--- branches/amdatu-auth-0.2.3/release-demo/pom.xml (original)
+++ branches/amdatu-auth-0.2.3/release-demo/pom.xml Wed Jun 13 15:07:12 2012
@@ -38,7 +38,7 @@
<org.amdatu.web.version>0.2.1</org.amdatu.web.version>
<org.amdatu.lib.version>0.2.1</org.amdatu.lib.version>
<org.amdatu.cassandra.version>0.2.3</org.amdatu.cassandra.version>
- <org.amdatu.opensocial.version>0.2.1-RC1</org.amdatu.opensocial.version>
+ <org.amdatu.opensocial.version>0.2.1-RC3</org.amdatu.opensocial.version>
<org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
@@ -423,6 +423,12 @@
<scope>runtime</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.shellcommands</artifactId>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
<!-- Add the OpenSocial dependencies -->
<dependency>
Modified: branches/amdatu-auth-0.2.3/tools/pom.xml
==============================================================================
--- branches/amdatu-auth-0.2.3/tools/pom.xml (original)
+++ branches/amdatu-auth-0.2.3/tools/pom.xml Wed Jun 13 15:07:12 2012
@@ -33,5 +33,6 @@
<module>loghandler</module>
<module>rest</module>
<module>rest-doclet</module>
+ <module>shellcommands</module>
</modules>
</project>
Added: branches/amdatu-auth-0.2.3/tools/shellcommands/.checkstyle
==============================================================================
--- (empty file)
+++ branches/amdatu-auth-0.2.3/tools/shellcommands/.checkstyle Wed Jun 13
15:07:12 2012
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true"
sync-formatter="false">
+ <fileset name="all" enabled="true" check-config-name="Amdatu" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
Added: branches/amdatu-auth-0.2.3/tools/shellcommands/LICENSE
==============================================================================
--- (empty file)
+++ branches/amdatu-auth-0.2.3/tools/shellcommands/LICENSE Wed Jun 13
15:07:12 2012
@@ -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: branches/amdatu-auth-0.2.3/tools/shellcommands/NOTICE
==============================================================================
--- (empty file)
+++ branches/amdatu-auth-0.2.3/tools/shellcommands/NOTICE Wed Jun 13
15:07:12 2012
@@ -0,0 +1,22 @@
+Amdatu Auth - Shell commands
+Copyright 2010, 2011 The Amdatu Foundation
+
+
+I. Included Software
+
+This product includes software developed by The Amdatu Foundation
(http://www.amdatu.org/).
+Copyright 2010, 2011 The Amdatu Foundation
+For more information, see http://amdatu.org.
+License: Apache Software License 2.0 (see
http://www.apache.org/licenses/LICENSE-2.0.html).
+
+
+II. Used Software
+
+This product uses software developed at The OSGi Alliance
(http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+License: Apache Software License 2.0 (see
http://www.apache.org/licenses/LICENSE-2.0.html).
+
+
+III. License Summary
+This products is licensed under the Apache Software License 2.0,
+see the LICENSE file included in this distribution.
Added: branches/amdatu-auth-0.2.3/tools/shellcommands/pom.xml
==============================================================================
--- (empty file)
+++ branches/amdatu-auth-0.2.3/tools/shellcommands/pom.xml Wed Jun 13
15:07:12 2012
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ 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.verning 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.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools</artifactId>
+ <version>0.2.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.auth.tools.shellcommands</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Auth - Shell commands</name>
+ <description>Felix shell commands</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.4.3</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-Activator>org.amdatu.auth.tools.shellcommands.osgi.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Added:
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/osgi/Activator.java
==============================================================================
--- (empty file)
+++
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/osgi/Activator.java
Wed Jun 13 15:07:12 2012
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010-2012 The Amdatu Foundation
+ *
+ * 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.
+ */
+package org.amdatu.auth.tools.shellcommands.osgi;
+
+import org.amdatu.auth.tools.shellcommands.service.OrderedPsCommandImpl;
+
+import org.apache.felix.shell.Command;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The Activator of the bundle.
+ *
+ * @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
+ */
+public class Activator implements BundleActivator {
+ private transient BundleContext m_context = null;
+
+ public void start(BundleContext context) {
+ m_context = context;
+
+ // Register the command service.
+ context.registerService(
+ Command.class.getName(), new OrderedPsCommandImpl(m_context),
null);
+ }
+
+ public void stop(BundleContext context) {
+ }
+}
\ No newline at end of file
Added:
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/service/OrderedPsCommandImpl.java
==============================================================================
--- (empty file)
+++
branches/amdatu-auth-0.2.3/tools/shellcommands/src/main/java/org/amdatu/auth/tools/shellcommands/service/OrderedPsCommandImpl.java
Wed Jun 13 15:07:12 2012
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2010-2012 The Amdatu Foundation
+ *
+ * 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.
+ */
+package org.amdatu.auth.tools.shellcommands.service;
+
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.StringTokenizer;
+
+import org.apache.felix.shell.Command;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.startlevel.StartLevel;
+
+/**
+ * This pso command is a copy from the Felix PsCommandImpl. It orders the
bundles by name
+ * before printing it in the console.
+ *
+ * @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
+ */
+public class OrderedPsCommandImpl implements Command {
+
+ private static final String LOCATION_SWITCH = "-l";
+ private static final String SYMBOLIC_NAME_SWITCH = "-s";
+ private static final String UPDATE_LOCATION_SWITCH = "-u";
+
+ private final BundleContext m_context;
+
+ public OrderedPsCommandImpl(BundleContext context) {
+ m_context = context;
+ }
+
+ public String getName() {
+ return "pso";
+ }
+
+ public String getUsage() {
+ return "pso [" + LOCATION_SWITCH
+ + " | " + SYMBOLIC_NAME_SWITCH
+ + " | " + UPDATE_LOCATION_SWITCH + "]";
+ }
+
+ public String getShortDescription() {
+ return "ordered list of installed bundles.";
+ }
+
+ public void execute(String s, PrintStream out, PrintStream err) {
+ // Get start level service.
+ ServiceReference ref = m_context.getServiceReference(
+ org.osgi.service.startlevel.StartLevel.class.getName());
+ StartLevel sl = null;
+ if (ref != null) {
+ sl = (StartLevel) m_context.getService(ref);
+ }
+
+ if (sl == null) {
+ out.println("StartLevel service is unavailable.");
+ }
+
+ // Parse command line.
+ StringTokenizer st = new StringTokenizer(s, " ");
+
+ // Ignore the command name.
+ st.nextToken();
+
+ // Check for optional argument.
+ boolean showLoc = false;
+ boolean showSymbolic = false;
+ boolean showUpdate = false;
+ if (st.countTokens() >= 1) {
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken().trim();
+ if (token.equals(LOCATION_SWITCH)) {
+ showLoc = true;
+ }
+ else if (token.equals(SYMBOLIC_NAME_SWITCH)) {
+ showSymbolic = true;
+ }
+ else if (token.equals(UPDATE_LOCATION_SWITCH)) {
+ showUpdate = true;
+ }
+ }
+ }
+ Bundle[] bundles = sortBundlesByName(m_context.getBundles());
+ if (bundles != null) {
+ printBundleList(bundles, sl, out, showLoc, showSymbolic,
showUpdate);
+ }
+ else {
+ out.println("There are no installed bundles.");
+ }
+ }
+
+ private Bundle[] sortBundlesByName(Bundle[] bundles) {
+ Arrays.sort(bundles, new BundleComparator());
+ return bundles;
+ }
+
+ private class BundleComparator implements Comparator<Bundle> {
+ public int compare(Bundle b1, Bundle b2) {
+ String name1 =
b1.getHeaders().get(Constants.BUNDLE_NAME).toString();
+ String name2 =
b2.getHeaders().get(Constants.BUNDLE_NAME).toString();
+ return name1.compareTo(name2);
+ }
+ }
+
+ protected void printBundleList(
+ Bundle[] bundles, StartLevel startLevel, PrintStream out, boolean
showLoc,
+ boolean showSymbolic, boolean showUpdate) {
+ // Display active start level.
+ if (startLevel != null) {
+ out.println("START LEVEL " + startLevel.getStartLevel());
+ }
+
+ // Print column headers.
+ String msg = " Name";
+ if (showLoc) {
+ msg = " Location";
+ }
+ else if (showSymbolic) {
+ msg = " Symbolic name";
+ }
+ else if (showUpdate) {
+ msg = " Update location";
+ }
+ String level = (startLevel == null) ? "" : " Level ";
+ out.println(" ID " + " State " + level + msg);
+ for (int i = 0; i < bundles.length; i++) {
+ // Get the bundle name or location.
+ String name = (String)
+ bundles[i].getHeaders().get(Constants.BUNDLE_NAME);
+ // If there is no name, then default to symbolic name.
+ name = (name == null) ? bundles[i].getSymbolicName() : name;
+ // If there is no symbolic name, resort to location.
+ name = (name == null) ? bundles[i].getLocation() : name;
+
+ // Overwrite the default value is the user specifically
+ // requested to display one or the other.
+ if (showLoc) {
+ name = bundles[i].getLocation();
+ }
+ else if (showSymbolic) {
+ name = bundles[i].getSymbolicName();
+ name = (name == null)
+ ? "<no symbolic name>" : name;
+ }
+ else if (showUpdate) {
+ name = (String)
+
bundles[i].getHeaders().get(Constants.BUNDLE_UPDATELOCATION);
+ name = (name == null)
+ ? bundles[i].getLocation() : name;
+ }
+ // Show bundle version if not showing location.
+ String version = (String)
+ bundles[i].getHeaders().get(Constants.BUNDLE_VERSION);
+ name = (!showLoc && !showUpdate && (version != null))
+ ? name + " (" + version + ")" : name;
+ long l = bundles[i].getBundleId();
+ String id = String.valueOf(l);
+ if (startLevel == null) {
+ level = "1";
+ }
+ else {
+ level =
String.valueOf(startLevel.getBundleStartLevel(bundles[i]));
+ }
+ while (level.length() < 5) {
+ level = " " + level;
+ }
+ while (id.length() < 4) {
+ id = " " + id;
+ }
+ out.println("[" + id + "] ["
+ + getStateString(bundles[i].getState())
+ + "] [" + level + "] " + name);
+ }
+ }
+
+ public String getStateString(int i) {
+ if (i == Bundle.ACTIVE) {
+ return "Active ";
+ }
+ else if (i == Bundle.INSTALLED) {
+ return "Installed ";
+ }
+ else if (i == Bundle.RESOLVED) {
+ return "Resolved ";
+ }
+ else if (i == Bundle.STARTING) {
+ return "Starting ";
+ }
+ else if (i == Bundle.STOPPING) {
+ return "Stopping ";
+ }
+ return "Unknown ";
+ }
+}
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
