You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2010/03/02 16:10:16 UTC
svn commit: r918068 - in
/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr:
AddUrlCommand.java ListUrlCommand.java ObrCommandSupport.java
RefreshUrlCommand.java RemoveUrlCommand.java ResolveCommand.java
SourceCommand.java
Author: gnodet
Date: Tue Mar 2 15:10:16 2010
New Revision: 918068
URL: http://svn.apache.org/viewvc?rev=918068&view=rev
Log:
FELIX-2113: update to latest OBR snapshot
Modified:
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java Tue Mar 2 15:10:16 2010
@@ -16,7 +16,6 @@
*/
package org.apache.felix.karaf.shell.obr;
-import java.net.URL;
import java.util.List;
import org.apache.felix.bundlerepository.RepositoryAdmin;
@@ -31,7 +30,7 @@
protected void doExecute(RepositoryAdmin admin) throws Exception {
for (String url : urls) {
- admin.addRepository(new URL(url));
+ admin.addRepository(url);
}
}
}
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java Tue Mar 2 15:10:16 2010
@@ -27,7 +27,7 @@
Repository[] repos = admin.listRepositories();
if ((repos != null) && (repos.length > 0)) {
for (int i = 0; i < repos.length; i++) {
- System.out.println(repos[i].getURL());
+ System.out.println(repos[i].getURI());
}
} else {
System.out.println("No repository URLs are set.");
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java Tue Mar 2 15:10:16 2010
@@ -19,6 +19,7 @@
import java.io.PrintStream;
import java.util.List;
+import org.apache.felix.bundlerepository.Reason;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Requirement;
import org.apache.felix.bundlerepository.Resolver;
@@ -57,7 +58,7 @@
protected abstract void doExecute(RepositoryAdmin admin) throws Exception;
- protected Resource[] searchRepository(RepositoryAdmin admin, String targetId, String targetVersion)
+ protected Resource[] searchRepository(RepositoryAdmin admin, String targetId, String targetVersion) throws InvalidSyntaxException
{
// Try to see if the targetId is a bundle ID.
try
@@ -186,7 +187,7 @@
try
{
System.out.print("\nDeploying...");
- resolver.deploy(start);
+ resolver.deploy(start ? Resolver.START : 0);
System.out.println("done.");
}
catch (IllegalStateException ex)
@@ -196,19 +197,15 @@
}
else
{
- Requirement[] reqs = resolver.getUnsatisfiedRequirements();
+ Reason[] reqs = resolver.getUnsatisfiedRequirements();
if ((reqs != null) && (reqs.length > 0))
{
System.out.println("Unsatisfied requirement(s):");
printUnderline(System.out, 27);
for (int reqIdx = 0; reqIdx < reqs.length; reqIdx++)
{
- System.out.println(" " + reqs[reqIdx].getFilter());
- Resource[] resources = resolver.getResources(reqs[reqIdx]);
- for (int resIdx = 0; resIdx < resources.length; resIdx++)
- {
- System.out.println(" " + resources[resIdx].getPresentationName());
- }
+ System.out.println(" " + reqs[reqIdx].getRequirement().getFilter());
+ System.out.println(" " + reqs[reqIdx].getResource().getPresentationName());
}
}
else
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java Tue Mar 2 15:10:16 2010
@@ -16,7 +16,6 @@
*/
package org.apache.felix.karaf.shell.obr;
-import java.net.URL;
import java.util.List;
import org.apache.felix.bundlerepository.Repository;
@@ -33,15 +32,13 @@
protected void doExecute(RepositoryAdmin admin) throws Exception {
if (urls != null && !urls.isEmpty()) {
for (String url : urls) {
- admin.removeRepository(new URL(url));
- admin.addRepository(new URL(url));
+ admin.addRepository(url);
}
} else {
Repository[] repos = admin.listRepositories();
if ((repos != null) && (repos.length > 0)) {
for (int i = 0; i < repos.length; i++) {
- admin.removeRepository(repos[i].getURL());
- admin.addRepository(repos[i].getURL());
+ admin.addRepository(repos[i].getURI());
}
}
}
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java Tue Mar 2 15:10:16 2010
@@ -16,7 +16,6 @@
*/
package org.apache.felix.karaf.shell.obr;
-import java.net.URL;
import java.util.List;
import org.apache.felix.bundlerepository.RepositoryAdmin;
@@ -31,7 +30,7 @@
protected void doExecute(RepositoryAdmin admin) throws Exception {
for (String url : urls) {
- admin.removeRepository(new URL(url));
+ admin.removeRepository(url);
}
}
}
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java Tue Mar 2 15:10:16 2010
@@ -20,6 +20,7 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.felix.bundlerepository.Reason;
import org.apache.felix.bundlerepository.Repository;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Requirement;
@@ -75,14 +76,14 @@
for (int resIdx = 0; resIdx < resources.length; resIdx++) {
System.out.println(" " + resources[resIdx].getPresentationName() + " (" + resources[resIdx].getVersion() + ")");
if (why) {
- Requirement[] req = resolver.getReason(resources[resIdx]);
+ Reason[] req = resolver.getReason(resources[resIdx]);
for (int reqIdx = 0; req != null && reqIdx < req.length; reqIdx++) {
- if (!req[reqIdx].isOptional()) {
+ if (!req[reqIdx].getRequirement().isOptional()) {
Resource r = req[reqIdx].getResource();
if (r != null) {
- System.out.println(" - " + r.getPresentationName() + " / " + req[reqIdx].getName() + ":" + req[reqIdx].getFilter());
+ System.out.println(" - " + r.getPresentationName() + " / " + req[reqIdx].getRequirement().getName() + ":" + req[reqIdx].getRequirement().getFilter());
} else {
- System.out.println(" - " + req[reqIdx].getName() + ":" + req[reqIdx].getFilter());
+ System.out.println(" - " + req[reqIdx].getRequirement().getName() + ":" + req[reqIdx].getRequirement().getFilter());
}
}
}
@@ -98,14 +99,14 @@
System.out.println(" " + resources[resIdx].getPresentationName()
+ " (" + resources[resIdx].getVersion() + ")");
if (why) {
- Requirement[] req = resolver.getReason(resources[resIdx]);
+ Reason[] req = resolver.getReason(resources[resIdx]);
for (int reqIdx = 0; req != null && reqIdx < req.length; reqIdx++) {
- if (!req[reqIdx].isOptional()) {
+ if (!req[reqIdx].getRequirement().isOptional()) {
Resource r = req[reqIdx].getResource();
if (r != null) {
- System.out.println(" - " + r.getPresentationName() + " / " + req[reqIdx].getName() + ":" + req[reqIdx].getFilter());
+ System.out.println(" - " + r.getPresentationName() + " / " + req[reqIdx].getRequirement().getName() + ":" + req[reqIdx].getRequirement().getFilter());
} else {
- System.out.println(" - " + req[reqIdx].getName() + ":" + req[reqIdx].getFilter());
+ System.out.println(" - " + req[reqIdx].getRequirement().getName() + ":" + req[reqIdx].getRequirement().getFilter());
}
}
}
@@ -116,7 +117,7 @@
try
{
System.out.print("\nDeploying...");
- resolver.deploy(start);
+ resolver.deploy(start ? Resolver.START : 0);
System.out.println("done.");
}
catch (IllegalStateException ex)
@@ -125,16 +126,13 @@
}
}
} else {
- Requirement[] reqs = resolver.getUnsatisfiedRequirements();
+ Reason[] reqs = resolver.getUnsatisfiedRequirements();
if ((reqs != null) && (reqs.length > 0)) {
System.out.println("Unsatisfied requirement(s):");
printUnderline(System.out, 27);
for (int reqIdx = 0; reqIdx < reqs.length; reqIdx++) {
- System.out.println(" " + reqs[reqIdx].getName() + ":" + reqs[reqIdx].getFilter());
- Resource[] resources = resolver.getResources(reqs[reqIdx]);
- for (int resIdx = 0; resIdx < resources.length; resIdx++) {
- System.out.println(" " + resources[resIdx].getPresentationName());
- }
+ System.out.println(" " + reqs[reqIdx].getRequirement().getName() + ":" + reqs[reqIdx].getRequirement().getFilter());
+ System.out.println(" " +reqs[reqIdx].getResource().getPresentationName());
}
} else {
System.out.println("Could not resolve targets.");
Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java?rev=918068&r1=918067&r2=918068&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java Tue Mar 2 15:10:16 2010
@@ -16,6 +16,7 @@
*/
package org.apache.felix.karaf.shell.obr;
+import java.net.URI;
import java.net.URL;
import java.util.List;
@@ -48,10 +49,10 @@
}
else
{
- URL srcURL = (URL) resource.getProperties().get(Resource.SOURCE_URL);
+ URI srcURL = (URI) resource.getProperties().get(Resource.SOURCE_URI);
if (srcURL != null)
{
- FileUtil.downloadSource(System.out, System.err, srcURL, localDir, extract);
+ FileUtil.downloadSource(System.out, System.err, srcURL.toURL(), localDir, extract);
}
else
{