10:32 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 04:32:40 -0500 (Sat, 13 Feb 2010)
New Revision: 100928
Added:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
Removed:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/extender/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/osgi/
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java
Log:
WIP
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-12 20:56:12 UTC
(rev 100927)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 09:32:40 UTC
(rev 100928)
@@ -67,9 +67,15 @@
<!-- Provided Dependencies -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
<version>${version.apache.aries.blueprint}</version>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>${version.apache.aries.blueprint}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -140,19 +146,36 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-
<Bundle-Activator>org.jboss.osgi.blueprint.extender.BlueprintActivator</Bundle-Activator>
- <Private-Package>
- org.jboss.osgi.blueprint.*
- </Private-Package>
+
<Bundle-Activator>org.jboss.osgi.blueprint.internal.BlueprintActivator</Bundle-Activator>
<Export-Package>
org.jboss.osgi.blueprint;version=${version},
+ org.osgi.service.blueprint*;version="1.0"
</Export-Package>
<Import-Package>
- org.jboss.osgi.spi.capability;version=1.0,
+ javax.xml.parsers,
+ javax.xml.transform*,
+ javax.xml.validation,
+
+ org.apache.aries.util.tracker;version="[1.0,1.1)",
+ org.jboss.osgi.spi*;version="[1.0,1.1)",
org.osgi.framework,
- org.osgi.service.blueprint.container;version=1.0,
- org.osgi.service.blueprint.reflect;version=1.0,
+ org.osgi.service.event,
+ org.osgi.util.tracker,
+
+ org.slf4j,
+ org.w3c.dom,
+ org.xml.sax,
+
+ !net.sf.cglib*,
+ !org.objectweb*,
</Import-Package>
+ <Embed-Dependency>
+ org.apache.aries.blueprint.api;inline=false,
+ org.apache.aries.blueprint.core;inline=false,
+ </Embed-Dependency>
+ <_exportcontents>
+ org.osgi.service.blueprint*;version=1.0
+ </_exportcontents>
</instructions>
</configuration>
</plugin>
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2010-02-12
20:56:12 UTC (rev 100927)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2010-02-13
09:32:40 UTC (rev 100928)
@@ -19,7 +19,6 @@
<include>*:jboss-osgi-husky:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
- <include>*:org.apache.aries.blueprint:jar</include>
<include>*:org.apache.aries.util:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2010-02-12
20:56:12 UTC (rev 100927)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2010-02-13
09:32:40 UTC (rev 100928)
@@ -43,7 +43,6 @@
super(BlueprintService.class.getName());
addBundle("bundles/org.apache.aries.util.jar");
- addBundle("bundles/org.apache.aries.blueprint.jar");
addBundle("bundles/jboss-osgi-blueprint.jar");
}
}
\ No newline at end of file
Copied:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
(from rev 100556,
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java)
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
(rev 0)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java 2010-02-13
09:32:40 UTC (rev 100928)
@@ -0,0 +1,57 @@
+/*
+ * 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.blueprint.internal;
+
+//$Id$
+
+import org.apache.aries.blueprint.container.BlueprintExtender;
+import org.jboss.osgi.blueprint.BlueprintService;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The Blueprint activator registeres the {@link BlueprintService}
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 13-May-2009
+ */
+public class BlueprintActivator implements BundleActivator
+{
+ BundleActivator ariesActivator;
+
+
+ public void start(BundleContext context) throws Exception
+ {
+ // Register the marker service
+ BlueprintService service = new BlueprintService(){};
+ context.registerService(BlueprintService.class.getName(), service, null);
+
+ ariesActivator = new BlueprintExtender();
+ ariesActivator.start(context);
+ }
+
+ public void stop(BundleContext context) throws Exception
+ {
+ if (ariesActivator != null)
+ ariesActivator.stop(context);
+ }
+}
\ No newline at end of file