[jboss-cvs] JBossAS SVN: r82767 - in projects/jboss-osgi/trunk: osgi-int/src/main/java/org/jboss/osgi/plugins/deployers and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jan 12 07:23:21 EST 2009


Author: alesj
Date: 2009-01-12 07:23:21 -0500 (Mon, 12 Jan 2009)
New Revision: 82767

Added:
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/ActivationPolicyMetaData.java
   projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/bundle/deployers/
   projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/deployers/
   projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/deployers/AllManifest.mf
Modified:
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ValueCreatorUtil.java
   projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/OSGiMetaData.java
   projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/OSGiTestCase.java
   projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java
   projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/metadata/Manifest.mf
   projects/jboss-osgi/trunk/pom.xml
Log:
[JBOSGI-26]; support activation policy metadata.

Modified: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -24,10 +24,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.classloading.plugins.metadata.PackageCapability;
-import org.jboss.classloading.plugins.metadata.PackageRequirement;
 import org.jboss.classloading.spi.metadata.Capability;
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
 import org.jboss.classloading.spi.metadata.Requirement;
 import org.jboss.classloading.spi.version.VersionComparatorRegistry;
 import org.jboss.deployers.spi.DeploymentException;
@@ -57,6 +56,9 @@
       setStage(DeploymentStages.DESCRIBE);
    }
 
+   /**
+    * Add OSGi Version impl to VersionComparatorRegistry.
+    */
    public void create()
    {
       VersionComparatorRegistry registry = VersionComparatorRegistry.getInstance();
@@ -65,6 +67,9 @@
       registry.registerVersionComparator(Version.class, org.jboss.classloading.spi.version.Version.class, OSGiVersionToVersionComparator.INSTANCE);
    }
 
+   /**
+    * Remove OSGi Version impl from VersionComparatorRegistry.
+    */
    public void destroy()
    {
       VersionComparatorRegistry registry = VersionComparatorRegistry.getInstance();
@@ -81,6 +86,7 @@
       if (bundleVersion != null)
          clmd.setVersion(bundleVersion);
       clmd.setDomain(deployment.getHeader("Domain-Name"));
+      ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
       List<PackageAttribute> exports = deployment.getExportPackages();
       if (exports != null && exports.isEmpty() == false)
       {
@@ -89,7 +95,7 @@
          {
             PackageInfo pi = pa.getPackageInfo();
             VersionRange vr = pa.getVersion();
-            capabilities.add(new PackageCapability(pi.getName(), vr.getFloor()));
+            capabilities.add(factory.createPackage(pi.getName(), vr.getFloor()));
          }
          clmd.setCapabilities(capabilities);
       }
@@ -102,7 +108,7 @@
             PackageInfo pi = pa.getPackageInfo();
             VersionRange vr = pa.getVersion();
             org.jboss.classloading.spi.version.VersionRange versionRange = new org.jboss.classloading.spi.version.VersionRange(vr.getFloor(), vr.getCeiling());
-            requirements.add(new PackageRequirement(pi.getName(), versionRange));
+            requirements.add(factory.createRequirePackage(pi.getName(), versionRange));
          }
          clmd.setRequirements(requirements);
       }

Added: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.plugins.metadata;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData;
+
+/**
+ * Activation policy impl.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class AbstractActivationPolicyMetaData implements ActivationPolicyMetaData, Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   private String type = "lazy";
+   private List<String> includes;
+   private List<String> excludes;
+
+   public String getType()
+   {
+      return type;
+   }
+
+   public void setType(String type)
+   {
+      this.type = type;
+   }
+
+   public List<String> getIncludes()
+   {
+      return includes;
+   }
+
+   public void setIncludes(List<String> includes)
+   {
+      this.includes = includes;
+   }
+
+   public List<String> getExcludes()
+   {
+      return excludes;
+   }
+
+   public void setExcludes(List<String> excludes)
+   {
+      this.excludes = excludes;
+   }
+}

Modified: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -33,6 +33,7 @@
 import org.jboss.osgi.spi.metadata.OSGiMetaData;
 import org.jboss.osgi.spi.metadata.PackageAttribute;
 import org.jboss.osgi.spi.metadata.ParameterizedAttribute;
+import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData;
 import static org.osgi.framework.Constants.*;
 import org.osgi.framework.Version;
 
@@ -61,11 +62,21 @@
       return get(key, STRING_VC);
    }
 
+   public ActivationPolicyMetaData getBundleActivationPolicy()
+   {
+      return get("Bundle-ActivationPolicy", ACTIVATION_POLICY_VC);
+   }
+
    public String getBundleActivator()
    {
       return get(BUNDLE_ACTIVATOR, STRING_VC);
    }
 
+   public List<String> getBundleCategory()
+   {
+      return get(BUNDLE_CATEGORY, STRING_LIST_VC);
+   }
+
    public List<String> getBundleClassPath()
    {
       return get(BUNDLE_CLASSPATH, STRING_LIST_VC, Arrays.asList("."));

Copied: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java (from rev 82761, projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/StringValueCreator.java)
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.osgi.plugins.metadata;
+
+import java.util.Arrays;
+
+import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData;
+
+/**
+ * Activation policy value creator.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+*/
+class ActivationPolicyMDValueCreator extends AbstractValueCreator<ActivationPolicyMetaData>
+{
+   private static final String INCLUDE = "include:=";
+   private static final String EXCLUDE = "exclude:=";
+
+   public ActivationPolicyMDValueCreator()
+   {
+      super(true);
+   }
+
+   protected ActivationPolicyMetaData useString(String attibute)
+   {
+      AbstractActivationPolicyMetaData aap = new AbstractActivationPolicyMetaData();
+      String[] split = attibute.split(";");
+      aap.setType(split[0]);
+      if (split.length > 1)
+         readDirective(aap, split[1]);
+      if (split.length > 2)
+         readDirective(aap, split[2]);
+      return aap;
+   }
+
+   /**
+    * Read the directive.
+    *
+    * @param aap the activation policy
+    * @param directive the directive
+    */
+   protected void readDirective(AbstractActivationPolicyMetaData aap, String directive)
+   {
+      if (directive.startsWith(INCLUDE))
+      {
+         String[] includes = directive.substring(INCLUDE.length() + 1, directive.length() - 1).split(",");
+         aap.setIncludes(Arrays.asList(includes));
+      }
+      else if (directive.startsWith(EXCLUDE))
+      {
+         String[] excludes = directive.substring(EXCLUDE.length() + 1, directive.length() - 1).split(",");
+         aap.setExcludes(Arrays.asList(excludes));
+      }
+   }
+}
\ No newline at end of file


Property changes on: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ValueCreatorUtil.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ValueCreatorUtil.java	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/plugins/metadata/ValueCreatorUtil.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -39,4 +39,5 @@
    public static ParameterizedAttributeListValueCreator QNAME_ATTRIB_LIST_VC = new QNameAttributeListValueCreator();
    public static ParameterizedAttributeListValueCreator PATH_ATTRIB_LIST_VC = new PathAttributeListValueCreator();
    public static PackageAttributeListValueCreator PACKAGE_LIST_VC = new PackageAttributeListValueCreator();
+   public static ActivationPolicyMDValueCreator ACTIVATION_POLICY_VC = new ActivationPolicyMDValueCreator();
 }

Copied: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/ActivationPolicyMetaData.java (from rev 82761, projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/OSGiMetaData.java)
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/ActivationPolicyMetaData.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/ActivationPolicyMetaData.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -0,0 +1,53 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.osgi.spi.metadata;
+
+import java.util.List;
+
+/**
+ * OSGi activation policy metadata.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface ActivationPolicyMetaData
+{
+   /**
+    * Get the type.
+    *
+    * @return the type
+    */
+   String getType();
+
+   /**
+    * Get include packages.
+    *
+    * @return the include packages
+    */
+   List<String> getIncludes();
+
+   /**
+    * Get the exclude packages.
+    *
+    * @return the exclude packages
+    */
+   List<String> getExcludes();
+}
\ No newline at end of file


Property changes on: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/ActivationPolicyMetaData.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/OSGiMetaData.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/OSGiMetaData.java	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/java/org/jboss/osgi/spi/metadata/OSGiMetaData.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -43,6 +43,13 @@
    String getHeader(String key);
 
    /**
+    * Get bundle activation policy.
+    *
+    * @return bundle activation policy
+    */
+   ActivationPolicyMetaData getBundleActivationPolicy();
+
+   /**
     * Get bundle activator class name.
     *
     * @return bundle activator classname or null if no such attribute
@@ -50,6 +57,13 @@
    String getBundleActivator();
 
    /**
+    * Get the bundle category
+    *
+    * @return list of category names
+    */
+   List<String> getBundleCategory();
+
+   /**
     * Get the bundle classpath
     *
     * @return list of JAR file path names or directories inside bundle

Modified: projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/OSGiTestCase.java	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/OSGiTestCase.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -47,7 +47,7 @@
    /**
     * Create a new OSGiTestCase.
     * 
-    * @param name
+    * @param name the test name
     */
    public OSGiTestCase(String name)
    {
@@ -57,9 +57,9 @@
    /**
     * Get the AbstractTestDelegate
     * 
-    * @param clazz
+    * @param clazz the test class
     * @return The AbstractTestDelegate
-    * @throws Exception
+    * @throws Exception for any error
     */
    public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
@@ -102,7 +102,7 @@
     * @param root the root location of the deployment
     * @param child the child to deploy
     * @return VFSDeployment
-    * @throws Exception
+    * @throws Exception for any error
     */
    protected VFSDeployment createVFSDeployment(String root, String child) throws Exception
    {
@@ -120,7 +120,7 @@
     * 
     * @param root the VirtualFile to deploy
     * @return VFSDeployment
-    * @throws Exception
+    * @throws Exception for any error
     */
    protected VFSDeployment createVFSDeployment(VirtualFile root) throws Exception
    {
@@ -134,7 +134,7 @@
     * @param root the location of the VirtualFile to deploy
     * @param child the child to deploy
     * @return VFSDeploymentUnit for the deployment
-    * @throws Exception
+    * @throws Exception for any error
     */
    protected VFSDeploymentUnit addDeployment(String root, String child) throws Exception
    {

Modified: projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java	2009-01-12 12:23:21 UTC (rev 82767)
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.jar.Manifest;
+import java.io.Serializable;
 
 import junit.framework.Test;
 import org.jboss.osgi.plugins.metadata.AbstractOSGiMetaData;
@@ -40,6 +41,7 @@
 import org.jboss.osgi.spi.metadata.Parameter;
 import org.jboss.osgi.spi.metadata.ParameterizedAttribute;
 import org.jboss.osgi.spi.metadata.VersionRange;
+import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData;
 import org.osgi.framework.Version;
 
 /**
@@ -62,11 +64,20 @@
    public void testSerializable() throws Exception
    {
       Manifest manifest = getManifest(createName(null));
-      AbstractOSGiMetaData metaData = new AbstractOSGiMetaData(manifest);
-      byte[] bytes = serialize(metaData);
-      metaData = (AbstractOSGiMetaData)deserialize(bytes);
+      OSGiMetaData metaData = new AbstractOSGiMetaData(manifest);
+      ActivationPolicyMetaData apmd = metaData.getBundleActivationPolicy();
+      assertNotNull(apmd);
+
+      metaData = serializeDeserialize((Serializable)metaData, OSGiMetaData.class);
       String vendor = metaData.getMainAttribute("Implementation-Vendor");
       assertEquals("jboss.org", vendor);
+      String bundleName = metaData.getBundleName();
+      assertEquals("SomeBundleName", bundleName);
+      apmd = metaData.getBundleActivationPolicy();
+      List<String> includes = apmd.getIncludes();
+      assertEquals(includes, Arrays.asList("org.jboss"));
+      List<String> excludes = apmd.getExcludes();
+      assertEquals(excludes, Arrays.asList("com.acme"));
    }
 
    public void testSimpleManifest() throws Exception

Added: projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/deployers/AllManifest.mf
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/deployers/AllManifest.mf	                        (rev 0)
+++ projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/deployers/AllManifest.mf	2009-01-12 12:23:21 UTC (rev 82767)
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.6.5
+Created-By: Ales Justin
+Implementation-Title: JBoss OSGi tests
+Implementation-Version: 2.0.0.beta2
+Implementation-Vendor: jboss.org
+Bundle-SymbolicName: com.acme.foo;singleton:=true
+Bundle-NativeCode: /lib/http.DLL;osname=QNX;osversion=3.1,/lib/tcp.DLL;/lib/iiop.DLL;osname=QWE;osversion=4.0
+DynamicImport-Package: org.jboss.test;user=alesj,com.acme.plugin.*;version=1.2.3.GA,*;test=test
+Export-Package: org.osgi.util.tracker;net.osgi.foo;version=1.3,org.jboss.test;version="[1.0,2.0)";uses=
+Fragment-Host: org.eclipse.swt;bundle-version="[3.0.0,4.0.0)"
+Import-Package: org.osgi.util.tracker;org.osgi.service.io;version=1.4;name=osgi,org.jboss.test;version="[2.0,3.0)";resolution:=osgi-int,com.acme;resolution:=optional
+Require-Bundle: com.acme.chess;visibility:=true,com.alesj.test;bundle-version=1.2
+

Modified: projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/metadata/Manifest.mf
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/metadata/Manifest.mf	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/jboss/test/bundle/metadata/Manifest.mf	2009-01-12 12:23:21 UTC (rev 82767)
@@ -4,4 +4,6 @@
 Implementation-Title: JBoss OSGi tests
 Implementation-Version: 2.0.0.beta2
 Implementation-Vendor: jboss.org
+Bundle-Name: SomeBundleName
+Bundle-ActivationPolicy: lazy;include:="org.jboss";exclude:="com.acme"
 

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-01-12 12:02:05 UTC (rev 82766)
+++ projects/jboss-osgi/trunk/pom.xml	2009-01-12 12:23:21 UTC (rev 82767)
@@ -37,13 +37,13 @@
   </modules>
 
   <properties>
-    <version.jboss.microcontainer>2.0.0.CR1</version.jboss.microcontainer>
-    <version.jboss.deployers>2.0.0.CR1</version.jboss.deployers>
-    <version.jboss.common.core>2.2.8.GA</version.jboss.common.core>
+    <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
+    <version.jboss.deployers>2.0.3.GA</version.jboss.deployers>
+    <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
     <version.osgi.r4.core>1.0</version.osgi.r4.core>
-    <version.jboss.aop>2.0.0.CR17</version.jboss.aop>
+    <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
     <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
   </properties>




More information about the jboss-cvs-commits mailing list