[jboss-osgi-commits] JBoss-OSGI SVN: r101816 - in projects/jboss-osgi/projects: deployers and 4 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Mar 4 07:27:00 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-04 07:26:58 -0500 (Thu, 04 Mar 2010)
New Revision: 101816
Added:
projects/jboss-osgi/projects/deployers/
projects/jboss-osgi/projects/deployers/trunk/
projects/jboss-osgi/projects/deployers/trunk/vfs21/
projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml
projects/jboss-osgi/projects/deployers/trunk/vfs21/src/
projects/jboss-osgi/projects/deployers/trunk/vfs30/
projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/
Removed:
projects/jboss-osgi/projects/deployers/trunk/src/
Modified:
projects/jboss-osgi/projects/deployers/trunk/.project
projects/jboss-osgi/projects/deployers/trunk/pom.xml
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java
Log:
Add deployers vfs abstraction
Copied: projects/jboss-osgi/projects/deployers/trunk (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk)
Modified: projects/jboss-osgi/projects/deployers/trunk/.project
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/.project 2010-03-04 10:26:57 UTC (rev 101810)
+++ projects/jboss-osgi/projects/deployers/trunk/.project 2010-03-04 12:26:58 UTC (rev 101816)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-runtime-deployer</name>
+ <name>jboss-osgi-deployers</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/projects/deployers/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2010-03-04 10:26:57 UTC (rev 101810)
+++ projects/jboss-osgi/projects/deployers/trunk/pom.xml 2010-03-04 12:26:58 UTC (rev 101816)
@@ -14,11 +14,11 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Runtime - Deployers</name>
+ <name>JBossOSGi Deployers</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.deployers</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<version>1.0.5-SNAPSHOT</version>
@@ -26,17 +26,24 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
<properties>
- <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
+ <!-- Modules -->
+ <modules>
+ <module>vfs21</module>
+ <module>vfs30</module>
+ </modules>
+
<!-- Dependencies -->
+ <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -59,21 +66,20 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${version.osgi}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${version.osgi}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
+ </dependencyManagement>
<!-- Subversion -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/deployers/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/deployers/trunk</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/runtime/deployers/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/deployers/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/deployers/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
</scm>
-
+
</project>
Property changes on: projects/jboss-osgi/projects/deployers/trunk/vfs21
___________________________________________________________________
Name: svn:ignore
+ target
Copied: projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml 2010-03-04 12:26:58 UTC (rev 101816)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi Deployers - VFS21</name>
+
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers-vfs21</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Copied: projects/jboss-osgi/projects/deployers/trunk/vfs21/src (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/src)
Property changes on: projects/jboss-osgi/projects/deployers/trunk/vfs30
___________________________________________________________________
Name: svn:ignore
+ target
Copied: projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml 2010-03-04 12:26:58 UTC (rev 101816)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi Deployers - VFS30</name>
+
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers-vfs30</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Copied: projects/jboss-osgi/projects/deployers/trunk/vfs30/src (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/src)
Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-04 10:26:57 UTC (rev 101810)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-04 12:26:58 UTC (rev 101816)
@@ -30,7 +30,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.osgi.deployment.deployer.Deployment;
import org.jboss.osgi.spi.OSGiConstants;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-04 10:26:57 UTC (rev 101810)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-04 12:26:58 UTC (rev 101816)
@@ -23,7 +23,6 @@
// $Id$
-import java.io.IOException;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -31,8 +30,8 @@
import org.jboss.deployers.spi.structure.ContextInfo;
import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
import org.osgi.framework.Constants;
/**
@@ -103,21 +102,14 @@
{
// [TODO] publish a Framework Event of type INFO
// [TODO] locate the class path entry in attached fragments
- try
- {
- VirtualFile child = root.getChild(path);
- addClassPath(structureContext, child, true, false, context);
- }
- catch (IOException ex)
- {
- log.info("Cannot find class path '" + path + "' in: " + root);
- }
+ VirtualFile child = root.getChild(path);
+ addClassPath(structureContext, child, true, false, context);
}
}
}
-
+
// We don't process children as potential subdeployments
-
+
return true;
}
catch (Exception e)
More information about the jboss-osgi-commits
mailing list