Applied patch (FELIX-167) to bring the iPOJO arch command in line with
the new version of iPOJO.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@469183 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo.arch/pom.xml b/ipojo.arch/pom.xml
index df6a7cc..f0856d7 100644
--- a/ipojo.arch/pom.xml
+++ b/ipojo.arch/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>ipojo-bundle</packaging>
<name>Apache Felix iPOJO Arch Command</name>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-incubator-SNAPSHOT</version>
<artifactId>org.apache.felix.ipojo.arch</artifactId>
<dependencies>
<dependency>
diff --git a/ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java b/ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
index 7885053..396d697 100644
--- a/ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
+++ b/ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
@@ -1,32 +1,29 @@
-/*
- * Copyright 2006 The Apache Software Foundation
+/*
+ * 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
*
- * 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
*
- * 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.
- *
+ * 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.ipojo.arch;
import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
import org.apache.felix.ipojo.architecture.Architecture;
import org.apache.felix.ipojo.architecture.ComponentDescription;
-import org.apache.felix.ipojo.architecture.DependencyDescription;
-import org.apache.felix.ipojo.architecture.ProvidedServiceDescription;
-import org.apache.felix.ipojo.architecture.State;
+import org.apache.felix.ipojo.architecture.HandlerDescription;
import org.ungoverned.osgi.service.shell.Command;
@@ -61,6 +58,25 @@
public String getShortDescription() {
return "Architecture command : display the architecture";
}
+
+
+ /**
+ * Return the String corresponding to a component state.
+ * @param state : the state in int
+ * @return : the string of the state (Stopped, Unresolved, Resolved) or "Unknown" if state is not revelant
+ */
+ private String getComponentState(int state) {
+ switch(state) {
+ case(0) :
+ return "STOPPED";
+ case(1) :
+ return "INVALID";
+ case(2) :
+ return "VALID";
+ default :
+ return "UNKNOWN";
+ }
+ }
/**
* @see org.ungoverned.osgi.service.shell.Command#execute(java.lang.String, java.io.PrintStream, java.io.PrintStream)
@@ -69,34 +85,20 @@
synchronized(this) {
for(int i=0; i < archiService.length; i++) {
ComponentDescription component = archiService[i].getComponentDescription();
- out.println("Component : " + component.getClassName() + " - " + State.printComponentState(component.getState()));
- for(int j = 0; j < component.getDependencies().length; j++) {
- DependencyDescription dd = component.getDependencies()[j];
- out.println("\t Dependency : " + dd.getInterface() + " - " + State.printDependencyState(dd.getState()) + " - Optional : " + dd.isOptional() + " - Multiple : " + dd.isMultiple());
- // getUsedServices :
- HashMap hm = dd.getUsedServices();
- Iterator it = hm.keySet().iterator();
- while(it.hasNext()) {
- String key = (String) it.next();
- out.println("\t\t Used Service : " + key + " - " + hm.get(key));
- }
+ out.println("Component : " + component.getClassName() + " - " + getComponentState(component.getState()) + " from bundle " + component.getBundleId());
+ for(int j = 0; j < component.getHandlers().length; j++) {
+ HandlerDescription hd = component.getHandlers()[j];
+ String hn = hd.getHandlerName();
+ String hv = "valid";
+ if(!hd.isValid()) { hv = "invalid"; }
+ String hi = hd.getHandlerInfo();
+ out.println("Handler : " + hn + " : " + hv);
+ if(!hi.equals("")) { out.println(hi); }
}
- for(int j=0; j < component.getProvideServices().length; j++) {
- ProvidedServiceDescription ps = component.getProvideServices()[j];
- String spec = "";
- for(int k = 0; k < ps.getServiceSpecification().length; k++) {
- spec = spec + " " + ps.getServiceSpecification()[k];
- }
- out.println("\t Provides : " + spec + " - " + State.printProvidedServiceState(ps.getState()));
- Enumeration e = ps.getProperties().propertyNames();
- while(e.hasMoreElements()) {
- Object key = e.nextElement();
- out.println("\t\t Service Property : " + key.toString() + " = " + ps.getProperties().getProperty(key.toString()));
- }
- }
- out.println("\tCreated Instances : ");
+
+ out.println("Created Instances of the POJO : ");
for(int j=0; j < component.getInstances().length; j++) {
- out.println("\t\t" + component.getInstances()[j]);
+ out.println("\t" + component.getInstances()[j]);
}
out.print("\n");
@@ -104,4 +106,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/ipojo.arch/src/main/resources/metadata.xml b/ipojo.arch/src/main/resources/metadata.xml
index b0bbbb3..60379c8 100644
--- a/ipojo.arch/src/main/resources/metadata.xml
+++ b/ipojo.arch/src/main/resources/metadata.xml
@@ -4,4 +4,5 @@
<Provides interface="org.ungoverned.osgi.service.shell.Command"/>
<Dependency field="archiService" optional="true"/>
</Component>
+ <instance component="org.apache.felix.ipojo.arch.ArchCommandImpl" name="ArchCommand"/>
</iPOJO>
\ No newline at end of file