Skip to content
This repository was archived by the owner on Dec 4, 2024. It is now read-only.

GERONIMO-6603: Change the inconsistent method name. #2

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

GERONIMO-6603: Change the inconsistent method name. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ private static void resetFrameworkProperties() {
}
}

protected void listBundles(BundleContext ctx) {
protected void logBundles(BundleContext ctx) {
StringBuilder b = new StringBuilder("Bundles:");
for (Bundle bundle: ctx.getBundles()) {
b.append("\n Id:").append(bundle.getBundleId()).append(" status:").append(bundle.getState()).append(" ").append(bundle.getLocation());
Expand All @@ -1106,7 +1106,7 @@ protected void waitForBundles(BundleContext ctx, long timeout) throws MojoExecut
}
}
}
listBundles(ctx);
logBundles(ctx);
throw new MojoExecutionException("Cant start all the bundles");
}

Expand Down
6 changes: 3 additions & 3 deletions ...port/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public void buildPackage() throws Exception {
getLog().debug("Creating kernel...");
bundleContext = getFramework().getBundleContext();
waitForBundles(bundleContext, 20000l);
listBundles(bundleContext);
logBundles(bundleContext);

getLog().debug("Starting configurations..." + Arrays.asList(deploymentConfigs));

Expand Down Expand Up @@ -311,7 +311,7 @@ public void buildPackage() throws Exception {
invokeDeployer(deployer, null);
} catch (Exception e) {
getLog().info("Exception, use console to investigate ", e);
listBundles(bundleContext);
logBundles(bundleContext);
PackageAdmin admin = (PackageAdmin) getService(bundleContext, PackageAdmin.class.getName(), null, 1000l);
// for (Bundle b : bundleContext.getBundles()) {
// int state = b.getState();
Expand All @@ -325,7 +325,7 @@ public void buildPackage() throws Exception {
// }
// }
// }
listBundles(bundleContext);
logBundles(bundleContext);
while (1 == 1) {
try {
Thread.sleep(1000L);
Expand Down