[jboss-cvs] JBossAS SVN: r84724 - in projects/jboss-osgi/branches/tdiesler: runtime and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Feb 25 06:49:57 EST 2009


Author: thomas.diesler at jboss.com
Date: 2009-02-25 06:49:57 -0500 (Wed, 25 Feb 2009)
New Revision: 84724

Added:
   projects/jboss-osgi/branches/tdiesler/runtime/pom.xml
   projects/jboss-osgi/branches/tdiesler/runtime/spi/
   projects/jboss-osgi/branches/tdiesler/runtime/spi/src/main/java/org/jboss/osgi/spi/jmx/
Removed:
   projects/jboss-osgi/branches/tdiesler/runtime/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java
Modified:
   projects/jboss-osgi/branches/tdiesler/pom.xml
   projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml
   projects/jboss-osgi/branches/tdiesler/runtime/spi/pom.xml
Log:
wip

Modified: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml	2009-02-25 11:48:36 UTC (rev 84723)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml	2009-02-25 11:49:57 UTC (rev 84724)
@@ -27,23 +27,27 @@
   <modules>
     <module>microcontainer</module>
     <module>repository</module>
+    <module>runtime</module>
     <!-- 
-    <module>runtime</module>
     <module>service</module>
     <module>testsuite</module>
     -->
   </modules>
 
   <properties>
-    <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
+    <version.felix.framework>1.4.1</version.felix.framework>
+    <version.felix.javax.servlet>1.0.0</version.felix.javax.servlet>
+    <version.felix.osgi.core>1.2.0</version.felix.osgi.core>
+    <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
+    <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
     <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.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
+    <version.junit>4.4</version.junit>
+    <version.log4j>1.2.14</version.log4j>
     <version.osgi.r4.core>1.0</version.osgi.r4.core>
-    <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>
 
   <dependencyManagement>
@@ -89,17 +93,45 @@
         <version>${version.jboss.logging.log4j}</version>
       </dependency>
       <dependency>
+        <groupId>org.jboss.aop</groupId>
+        <artifactId>jboss-aop</artifactId>
+        <version>${version.jboss.aop}</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${version.log4j}</version>
+      </dependency>
+      <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi_R4_core</artifactId>
         <version>${version.osgi.r4.core}</version>
       </dependency>
+      
+      <!-- Felix Dependencies -->
       <dependency>
-        <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop</artifactId>
-        <version>${version.jboss.aop}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>javax.servlet</artifactId>
+        <version>${version.felix.javax.servlet}</version>
       </dependency>
-      <!-- test dependencies -->
       <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>${version.felix.osgi.core}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${version.felix.osgi.core}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.framework</artifactId>
+        <version>${version.felix.framework}</version>
+      </dependency>
+      
+      <!-- Test Dependencies -->
+      <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-test</artifactId>
         <version>${version.org.jboss.test}</version>

Modified: projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml	2009-02-25 11:48:36 UTC (rev 84723)
+++ projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml	2009-02-25 11:49:57 UTC (rev 84724)
@@ -2,8 +2,8 @@
 <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>JBoss OSGi - Integration Felix</name>
-  <description>JBoss OSGi - Apache Felix Integration</description>
+  <name>JBoss OSGi - Runtime Felix</name>
+  <description>JBoss OSGi - Apache Felix Runtime</description>
 
   <groupId>org.jboss.osgi</groupId>
   <artifactId>jboss-osgi-felix</artifactId>
@@ -11,8 +11,8 @@
 
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi-integration</artifactId>
-    <version>1.0.0.Alpha2</version>
+    <artifactId>jboss-osgi-runtime</artifactId>
+    <version>1.0.0.Alpha3</version>
   </parent>
 
   <!-- Properties -->

Added: projects/jboss-osgi/branches/tdiesler/runtime/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/runtime/pom.xml	                        (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/runtime/pom.xml	2009-02-25 11:49:57 UTC (rev 84724)
@@ -0,0 +1,19 @@
+<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>JBoss OSGi - Runtime</name>
+  <artifactId>jboss-osgi-runtime</artifactId>
+  <packaging>pom</packaging>
+  
+  <parent>
+    <groupId>org.jboss.osgi</groupId>
+    <artifactId>jboss-osgi</artifactId>
+    <version>1.0.0.Alpha3</version>
+  </parent>
+  
+  <modules>
+    <module>spi</module>
+    <module>felix</module>
+  </modules>
+
+</project>


Property changes on: projects/jboss-osgi/branches/tdiesler/runtime/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: projects/jboss-osgi/branches/tdiesler/runtime/spi (from rev 84672, projects/jboss-felix/trunk/modules/spi)


Property changes on: projects/jboss-osgi/branches/tdiesler/runtime/spi
___________________________________________________________________
Name: svn:ignore
   + target

Name: svn:mergeinfo
   + 

Modified: projects/jboss-osgi/branches/tdiesler/runtime/spi/pom.xml
===================================================================
--- projects/jboss-felix/trunk/modules/spi/pom.xml	2009-02-24 15:56:16 UTC (rev 84672)
+++ projects/jboss-osgi/branches/tdiesler/runtime/spi/pom.xml	2009-02-25 11:49:57 UTC (rev 84724)
@@ -2,8 +2,8 @@
 <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>JBoss OSGi - SPI</name>
-  <description>JBoss OSGi - Service Provider Interface</description>
+  <name>JBoss OSGi - Runtime SPI</name>
+  <description>JBoss OSGi - Runtime SPI</description>
 
   <groupId>org.jboss.osgi</groupId>
   <artifactId>jboss-osgi-spi</artifactId>
@@ -12,9 +12,8 @@
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
-    <version>1.0.0.Alpha2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <artifactId>jboss-osgi-runtime</artifactId>
+    <version>1.0.0.Alpha3</version>
   </parent>
 
   <!-- Dependencies -->

Deleted: projects/jboss-osgi/branches/tdiesler/runtime/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java
===================================================================
--- projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java	2009-02-24 15:56:16 UTC (rev 84672)
+++ projects/jboss-osgi/branches/tdiesler/runtime/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java	2009-02-25 11:49:57 UTC (rev 84724)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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;
-
-// $Id$
-
-import java.util.Hashtable;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * A simple factory for creating safe object names.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 08-May-2006
- */
-public class ObjectNameFactory
-{
-   public static ObjectName create(String name)
-   {
-      try
-      {
-         return new ObjectName(name);
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new Error("Invalid ObjectName: " + name + "; " + e);
-      }
-   }
-
-   public static ObjectName create(String domain, String key, String value)
-   {
-      try
-      {
-         return new ObjectName(domain, key, value);
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
-      }
-   }
-
-   public static ObjectName create(String domain, Hashtable<String, String> table)
-   {
-      try
-      {
-         return new ObjectName(domain, table);
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
-      }
-   }
-}

Copied: projects/jboss-osgi/branches/tdiesler/runtime/spi/src/main/java/org/jboss/osgi/spi/jmx (from rev 84673, projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/jmx)




More information about the jboss-cvs-commits mailing list