dev@glassfish.java.net

osgi.bundle changes

From: Justin Lee <justin.d.lee_at_oracle.com>
Date: Wed, 13 Oct 2010 18:00:03 -0400

  To fix https://glassfish.dev.java.net/issues/show_bug.cgi?id=13914 I
need to change the admin/cli and admin/rest osgi.bundle files. Can
someone confirm this is correct. The command runs as expected now at least.


Index:
cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/HtmlFormat.java
===================================================================
---
cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/HtmlFormat.java
(revision 41411)
+++
cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/HtmlFormat.java
(working copy)
@@ -204,7 +204,6 @@
          InputStreamReader reader = null;
          PrintWriter writer = null;
          try {
- System.out.println("HtmlFormat.copy: resource = " + resource);
              InputStream stream = getClass().getResourceAsStream(resource);
              reader = new InputStreamReader(stream);
              writer = new PrintWriter(new File(dir, resource));
Index: cli/osgi.bundle
===================================================================
--- cli/osgi.bundle (revision 41411)
+++ cli/osgi.bundle (working copy)
@@ -38,8 +38,12 @@
  # holder.
  #

+DynamicImport-Package: \
+ org.glassfish.admin.rest
+
  -exportcontents: \
                          com.sun.enterprise.admin.cli; \
                          com.sun.enterprise.admin.cli.remote; \
                          com.sun.enterprise.admin.cli.schemadoc; \
                          version=${project.osgi.version}
+
Index: rest/osgi.bundle
===================================================================
--- rest/osgi.bundle (revision 41411)
+++ rest/osgi.bundle (working copy)
@@ -38,7 +38,8 @@
  # holder.
  #

--exportcontents:
+-exportcontents: \
+ org.glassfish.admin.rest
  DynamicImport-Package: \
                          com.sun.jersey.api.container, \
                          com.sun.jersey.api.core, \