[jboss-cvs] JBossAS SVN: r63694 - in projects/microcontainer/trunk: deployers-client and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 27 13:54:53 EDT 2007
Author: adrian at jboss.org
Date: 2007-06-27 13:54:53 -0400 (Wed, 27 Jun 2007)
New Revision: 63694
Added:
projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/helpers/
projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/helpers/AbstractManifestMetaData.java
Removed:
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeploymentResolver.java
Modified:
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/deployers-client-spi/
projects/microcontainer/trunk/deployers-client-spi/pom.xml
projects/microcontainer/trunk/deployers-client/
projects/microcontainer/trunk/deployers-client/pom.xml
projects/microcontainer/trunk/deployers-core-spi/
projects/microcontainer/trunk/deployers-core-spi/pom.xml
projects/microcontainer/trunk/deployers-core/
projects/microcontainer/trunk/deployers-core/pom.xml
projects/microcontainer/trunk/deployers-impl/
projects/microcontainer/trunk/deployers-impl/pom.xml
projects/microcontainer/trunk/deployers-spi/
projects/microcontainer/trunk/deployers-spi/pom.xml
projects/microcontainer/trunk/deployers-structure-spi/
projects/microcontainer/trunk/deployers-structure-spi/pom.xml
projects/microcontainer/trunk/deployers-vfs-spi/
projects/microcontainer/trunk/deployers-vfs-spi/pom.xml
projects/microcontainer/trunk/deployers-vfs/
projects/microcontainer/trunk/deployers-vfs/pom.xml
projects/microcontainer/trunk/osgi-int/.classpath
projects/microcontainer/trunk/osgi-int/pom.xml
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeclarativeDeployer.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeployer.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeploymentVisitor.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiServiceDeployer.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/ServiceDeploymentDeployer.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java
projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/spi/metadata/OSGiMetaData.java
Log:
Fixed the poms to the new group id. Also didn't refactor osgi-int for some reason?
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/build/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -174,7 +174,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-container</artifactId>
<version>${project.version}</version>
</dependency>
@@ -201,75 +201,75 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-impl</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${project.version}</version>
</dependency>
Property changes on: projects/microcontainer/trunk/deployers-client
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-client/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-client/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -46,7 +46,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<scope>test</scope>
</dependency>
Property changes on: projects/microcontainer/trunk/deployers-client-spi
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-client-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-client-spi/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -14,11 +14,11 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-managed</artifactId>
</dependency>
</dependencies>
Property changes on: projects/microcontainer/trunk/deployers-core
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-core/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-core/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
<dependency>
Property changes on: projects/microcontainer/trunk/deployers-core-spi
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-core-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-core-spi/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
Property changes on: projects/microcontainer/trunk/deployers-impl
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-impl/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-impl/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-impl/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -29,15 +29,15 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-classloader</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -54,12 +54,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
<scope>test</scope>
</dependency>
Property changes on: projects/microcontainer/trunk/deployers-spi
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-spi/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-spi/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -14,7 +14,7 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
</dependencies>
Property changes on: projects/microcontainer/trunk/deployers-structure-spi
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-structure-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-structure-spi/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -46,18 +46,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
<scope>test</scope>
</dependency>
Property changes on: projects/microcontainer/trunk/deployers-vfs
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-vfs/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-vfs/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -21,23 +21,23 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-impl</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -54,19 +54,19 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-impl</artifactId>
<type>test-jar</type>
<scope>test</scope>
Property changes on: projects/microcontainer/trunk/deployers-vfs-spi
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/microcontainer/trunk/deployers-vfs-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/deployers-vfs-spi/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -14,11 +14,11 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-classloader</artifactId>
</dependency>
<dependency>
Added: projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/helpers/AbstractManifestMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/helpers/AbstractManifestMetaData.java (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/helpers/AbstractManifestMetaData.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -0,0 +1,156 @@
+/*
+* 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.deployers.vfs.spi.deployer.helpers;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.jboss.deployers.vfs.spi.deployer.ManifestMetaData;
+
+/**
+ * Abstract manifest meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AbstractManifestMetaData implements ManifestMetaData, Externalizable
+{
+ private static final long serialVersionUID = 1L;
+
+ protected transient Manifest manifest;
+
+ public AbstractManifestMetaData()
+ {
+ }
+
+ public AbstractManifestMetaData(Manifest manifest)
+ {
+ if (manifest == null)
+ throw new IllegalArgumentException("Null manifest!");
+ this.manifest = manifest;
+ }
+
+ protected Manifest getManifest()
+ {
+ if (manifest == null)
+ throw new IllegalArgumentException("Null manifest!");
+ return manifest;
+ }
+
+ protected String get(Attributes attributes, String name)
+ {
+ return attributes != null ? attributes.getValue(name) : null;
+ }
+
+ public String getMainAttribute(String name)
+ {
+ return get(getManifest().getMainAttributes(), name);
+ }
+
+ public String getAttribute(String attributesName, String name)
+ {
+ return get(getManifest().getAttributes(attributesName), name);
+ }
+
+ public String getEntry(String entryName, String name)
+ {
+ Map<String,Attributes> entries = getManifest().getEntries();
+ if (entries != null)
+ {
+ return get(entries.get(entryName), name);
+ }
+ return null;
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException
+ {
+ OutputStream os = new OutputWrapper(out);
+ getManifest().write(os);
+ }
+
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+ {
+ InputStream is = new InputWrapper(in);
+ manifest = new Manifest(is);
+ }
+
+ private class OutputWrapper extends OutputStream
+ {
+ private ObjectOutput out;
+
+ public OutputWrapper(ObjectOutput out)
+ {
+ this.out = out;
+ }
+
+ public void write(int b) throws IOException
+ {
+ out.write(b);
+ }
+
+ public void flush() throws IOException
+ {
+ out.flush();
+ }
+
+ public void close() throws IOException
+ {
+ out.close();
+ }
+ }
+
+ private class InputWrapper extends InputStream
+ {
+ private ObjectInput in;
+
+ public InputWrapper(ObjectInput in)
+ {
+ this.in = in;
+ }
+
+ public int read() throws IOException
+ {
+ return in.read();
+ }
+
+ public long skip(long n) throws IOException
+ {
+ return in.skip(n);
+ }
+
+ public int available() throws IOException
+ {
+ return in.available();
+ }
+
+ public void close() throws IOException
+ {
+ in.close();
+ }
+ }
+}
Modified: projects/microcontainer/trunk/osgi-int/.classpath
===================================================================
--- projects/microcontainer/trunk/osgi-int/.classpath 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/.classpath 2007-06-27 17:54:53 UTC (rev 63694)
@@ -6,7 +6,10 @@
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-vfs/2.0.4.snapshot/jboss-vfs-2.0.4.snapshot.jar" sourcepath="M2_REPO/jboss/jboss-vfs/2.0.4.snapshot/jboss-vfs-2.0.4.snapshot-sources.jar"/>
- <classpathentry kind="src" path="/jboss-deployers"/>
+ <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
+ <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
+ <classpathentry kind="src" path="/jboss-deployers-vfs-spi"/>
+ <classpathentry kind="src" path="/jboss-deployers-spi"/>
<classpathentry kind="src" path="/jboss-metatype"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
Modified: projects/microcontainer/trunk/osgi-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/pom.xml 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/pom.xml 2007-06-27 17:54:53 UTC (rev 63694)
@@ -54,11 +54,11 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
+ <artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers</artifactId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -24,9 +24,9 @@
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.osgi.plugins.facade.BundleContextImpl;
@@ -38,12 +38,13 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class BundleActivatorDeployer extends AbstractRealDeployer<OSGiMetaData>
+public class BundleActivatorDeployer extends AbstractRealDeployerWithInput<OSGiMetaData>
{
private final KernelController controller;
public BundleActivatorDeployer(Kernel kernel)
{
+ super(OSGiMetaData.class);
if (kernel == null)
throw new IllegalArgumentException("Null kernel");
controller = kernel.getController();
@@ -64,7 +65,7 @@
{
String name = createBundleActivatorBeanName(deployment);
// todo - get deployment context in non-depricated way
- BundleContext bundleContext = new BundleContextImpl(unit.getDeploymentContext());
+ BundleContext bundleContext = new BundleContextImpl(unit);
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, bundleActivator)
.addStartParameter(BundleContext.class.getName(), bundleContext)
.addStopParameter(BundleContext.class.getName(), bundleContext);
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeclarativeDeployer.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeclarativeDeployer.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeclarativeDeployer.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -21,9 +21,8 @@
*/
package org.jboss.osgi.plugins.deployers;
-import org.jboss.deployers.plugins.deployers.helpers.SchemaResolverDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
import org.jboss.osgi.spi.metadata.ServiceDeployment;
import org.jboss.virtual.VirtualFile;
@@ -37,6 +36,7 @@
public OSGiDeclarativeDeployer()
{
super(ServiceDeployment.class);
+ setSuffix("-osgi.xml");
}
protected void init(DeploymentUnit unit, ServiceDeployment metaData, VirtualFile file) throws Exception
@@ -44,13 +44,4 @@
String name = file.toURI().toString();
metaData.setName(name);
}
-
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- createMetaData(unit, null, "-osgi.xml");
- }
-
- public void undeploy(DeploymentUnit unit)
- {
- }
}
Deleted: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeploymentResolver.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeploymentResolver.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiDeploymentResolver.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -1,50 +0,0 @@
-/*
-* 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.deployers;
-
-import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.deployers.plugins.deployers.helpers.DeploymentResolver;
-import org.jboss.kernel.Kernel;
-import org.jboss.osgi.spi.metadata.OSGiMetaData;
-
-/**
- * Handle DeploymentControllerContext regarding OSGi meta data.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class OSGiDeploymentResolver extends DeploymentResolver<OSGiMetaData>
-{
- public OSGiDeploymentResolver(Kernel kernel)
- {
- super(OSGiMetaData.class, kernel);
- }
-
- protected void addDependencies(OSGiMetaData deployment, DependencyInfo dependencyInfo)
- {
- //todo
- }
-
- protected void removeDependencies(OSGiMetaData deployment, DependencyInfo dependencyInfo)
- {
- //todo
- }
-}
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeployer.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeployer.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeployer.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -23,7 +23,7 @@
import java.util.jar.Manifest;
-import org.jboss.deployers.plugins.deployers.helpers.ManifestDeployer;
+import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer;
import org.jboss.osgi.plugins.metadata.AbstractOSGiMetaData;
import org.jboss.osgi.spi.metadata.OSGiMetaData;
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeploymentVisitor.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeploymentVisitor.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaDataDeploymentVisitor.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -21,7 +21,7 @@
*/
package org.jboss.osgi.plugins.deployers;
-import org.jboss.deployers.plugins.deployers.helpers.SimpleDeploymentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
import org.jboss.osgi.spi.metadata.OSGiMetaData;
/**
@@ -31,7 +31,7 @@
* @see BundleActivatorDeployer
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public abstract class OSGiMetaDataDeploymentVisitor implements SimpleDeploymentVisitor<OSGiMetaData>
+public abstract class OSGiMetaDataDeploymentVisitor implements DeploymentVisitor<OSGiMetaData>
{
public Class<OSGiMetaData> getVisitorType()
{
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiServiceDeployer.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiServiceDeployer.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiServiceDeployer.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -22,9 +22,9 @@
package org.jboss.osgi.plugins.deployers;
import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.osgi.plugins.dependency.OSGiServiceReferenceContext;
@@ -48,12 +48,13 @@
if (kernel == null)
throw new IllegalArgumentException("Null kernel");
controller = kernel.getController();
+ setComponentsOnly(true);
}
public void deploy(DeploymentUnit unit, ServiceMetaData deployment) throws DeploymentException
{
// todo - get deployment context in non-depricated way
- BundleContext bundleContext = new BundleContextImpl(unit.getDeploymentContext());
+ BundleContext bundleContext = new BundleContextImpl(unit);
ControllerContext context = new OSGiServiceReferenceContext(deployment, bundleContext);
try
{
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -21,16 +21,15 @@
*/
package org.jboss.osgi.plugins.deployers;
-import org.jboss.deployers.plugins.structure.vfs.AbstractStructureDeployer;
-import org.jboss.deployers.spi.structure.vfs.StructureMetaData;
-import org.jboss.deployers.spi.structure.vfs.StructuredDeployers;
+import org.jboss.deployers.spi.structure.StructureMetaData;
+import org.jboss.deployers.vfs.spi.structure.VFSStructuralDeployers;
+import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
import org.jboss.virtual.VirtualFile;
/**
* OSGi structure deployer.
* Reads manifest for OSGi classpath.
*
- * @see org.jboss.deployers.plugins.structure.vfs.jar.JARStructure
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public class OSGiStructure extends AbstractStructureDeployer
@@ -41,7 +40,7 @@
setRelativeOrder(10001);
}
- public boolean determineStructure(VirtualFile root, StructureMetaData metaData, StructuredDeployers deployers)
+ public boolean determineStructure(VirtualFile root, VirtualFile parent, VirtualFile file, StructureMetaData metaData, VFSStructuralDeployers deployers)
{
// todo - see JarStructure
return false;
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/ServiceDeploymentDeployer.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/ServiceDeploymentDeployer.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/ServiceDeploymentDeployer.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -23,10 +23,10 @@
import java.util.List;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.plugins.deployers.helpers.SimpleDeploymentVisitor;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
+import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.osgi.spi.metadata.ServiceDeployment;
import org.jboss.osgi.spi.metadata.ServiceMetaData;
@@ -58,7 +58,7 @@
/**
* ServiceDeploymentVisitor.
*/
- private static class ServiceDeploymentVisitor implements SimpleDeploymentVisitor<ServiceDeployment>
+ private static class ServiceDeploymentVisitor implements DeploymentVisitor<ServiceDeployment>
{
public Class<ServiceDeployment> getVisitorType()
{
@@ -83,7 +83,7 @@
/**
* ServiceMetaDataVisitor.
*/
- private static class ServiceMetaDataVisitor implements SimpleDeploymentVisitor<ServiceMetaData>
+ private static class ServiceMetaDataVisitor implements DeploymentVisitor<ServiceMetaData>
{
public Class<ServiceMetaData> getVisitorType()
{
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -35,7 +35,7 @@
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.spi.config.KernelConfigurator;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -72,7 +72,7 @@
/** The service reference comparator */
private static Comparator<ServiceReference> serviceRefenceComparator = new ServiceReferenceComparator();
- protected DeploymentContext context;
+ protected DeploymentUnit context;
protected Bundle bundle;
protected KernelController controller; // todo - get it
protected KernelEventEmitter emitterDelegate; // todo - get it
@@ -81,7 +81,7 @@
protected Map<EventListener, AbstractDelegateListener> listeners = Collections.synchronizedMap(new HashMap<EventListener, AbstractDelegateListener>());
protected Map<ServiceListener, KernelEventFilter> filters = Collections.synchronizedMap(new HashMap<ServiceListener, KernelEventFilter>());
- public BundleContextImpl(DeploymentContext context)
+ public BundleContextImpl(DeploymentUnit context)
{
this.context = context;
}
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -27,7 +27,7 @@
import java.util.Dictionary;
import java.util.Enumeration;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
@@ -39,11 +39,11 @@
*/
public class BundleImpl implements Bundle
{
- protected DeploymentContext context;
+ protected DeploymentUnit unit;
- public BundleImpl(DeploymentContext context)
+ public BundleImpl(DeploymentUnit unit)
{
- this.context = context;
+ this.unit = unit;
}
public int getState()
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -21,6 +21,33 @@
*/
package org.jboss.osgi.plugins.metadata;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.INTEGER_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.PACKAGE_LIST_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.PARAM_ATTRIB_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.PATH_ATTRIB_LIST_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.QNAME_ATTRIB_LIST_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.STRING_LIST_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.STRING_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.URL_VC;
+import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.VERSION_VC;
+import static org.osgi.framework.Constants.BUNDLE_ACTIVATOR;
+import static org.osgi.framework.Constants.BUNDLE_CLASSPATH;
+import static org.osgi.framework.Constants.BUNDLE_DESCRIPTION;
+import static org.osgi.framework.Constants.BUNDLE_LOCALIZATION;
+import static org.osgi.framework.Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
+import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
+import static org.osgi.framework.Constants.BUNDLE_NAME;
+import static org.osgi.framework.Constants.BUNDLE_NATIVECODE;
+import static org.osgi.framework.Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT;
+import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
+import static org.osgi.framework.Constants.BUNDLE_UPDATELOCATION;
+import static org.osgi.framework.Constants.BUNDLE_VERSION;
+import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
+import static org.osgi.framework.Constants.EXPORT_PACKAGE;
+import static org.osgi.framework.Constants.FRAGMENT_HOST;
+import static org.osgi.framework.Constants.IMPORT_PACKAGE;
+import static org.osgi.framework.Constants.REQUIRE_BUNDLE;
+
import java.net.URL;
import java.util.Arrays;
import java.util.HashMap;
@@ -28,12 +55,10 @@
import java.util.Map;
import java.util.jar.Manifest;
-import org.jboss.deployers.plugins.metadata.AbstractManifestMetaData;
-import static org.jboss.osgi.plugins.metadata.ValueCreatorUtil.*;
+import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData;
import org.jboss.osgi.spi.metadata.OSGiMetaData;
import org.jboss.osgi.spi.metadata.PackageAttribute;
import org.jboss.osgi.spi.metadata.ParameterizedAttribute;
-import static org.osgi.framework.Constants.*;
import org.osgi.framework.Version;
/**
Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/spi/metadata/OSGiMetaData.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/spi/metadata/OSGiMetaData.java 2007-06-27 17:43:19 UTC (rev 63693)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/spi/metadata/OSGiMetaData.java 2007-06-27 17:54:53 UTC (rev 63694)
@@ -24,7 +24,7 @@
import java.net.URL;
import java.util.List;
-import org.jboss.deployers.spi.metadata.ManifestMetaData;
+import org.jboss.deployers.vfs.spi.deployer.ManifestMetaData;
import org.osgi.framework.Version;
/**
More information about the jboss-cvs-commits
mailing list