JBoss-OSGI SVN: r91098 - in projects/jboss-osgi/projects: integration/deployers/trunk/src/main/java/org/jboss/osgi/deployer and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 11:20:22 -0400 (Fri, 10 Jul 2009)
New Revision: 91098
Modified:
projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java
projects/jboss-osgi/projects/integration/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java
Log:
[JBOSGI-105] Lazy bundle activation policy for runtime bundles
Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java 2009-07-10 15:20:03 UTC (rev 91097)
+++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java 2009-07-10 15:20:22 UTC (rev 91098)
@@ -103,7 +103,13 @@
try
{
log.log(LogService.LOG_DEBUG, "Start: " + bundle);
+
+ // Added support for Bundle.START_ACTIVATION_POLICY on start
+ // http://issues.apache.org/jira/browse/FELIX-1317
+ // bundle.start(Bundle.START_ACTIVATION_POLICY);
+
bundle.start();
+
log.log(LogService.LOG_INFO, "Started: " + bundle);
packageHelper.logExportedPackages(bundle);
}
Modified: projects/jboss-osgi/projects/integration/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java
===================================================================
--- projects/jboss-osgi/projects/integration/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java 2009-07-10 15:20:03 UTC (rev 91097)
+++ projects/jboss-osgi/projects/integration/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java 2009-07-10 15:20:22 UTC (rev 91098)
@@ -103,7 +103,12 @@
ExportedPackageHelper packageHelper = new ExportedPackageHelper(systemContext);
try
{
+ // Added support for Bundle.START_ACTIVATION_POLICY on start
+ // http://issues.apache.org/jira/browse/FELIX-1317
+ // bundle.start(Bundle.START_ACTIVATION_POLICY);
+
bundle.start();
+
log.info("Started: " + bundle);
packageHelper.logExportedPackages(bundle);
}
@@ -145,7 +150,12 @@
it.remove();
try
{
+ // Added support for Bundle.START_ACTIVATION_POLICY on start
+ // http://issues.apache.org/jira/browse/FELIX-1317
+ // auxBundle.start(Bundle.START_ACTIVATION_POLICY);
+
auxBundle.start();
+
packageHelper.logExportedPackages(bundle);
log.info("Started: " + bundle);
}
16 years, 5 months
JBoss-OSGI SVN: r91093 - projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/apache/xerces/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 11:15:25 -0400 (Fri, 10 Jul 2009)
New Revision: 91093
Modified:
projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java
Log:
fix typo
Modified: projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java
===================================================================
--- projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java 2009-07-10 15:12:54 UTC (rev 91092)
+++ projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java 2009-07-10 15:15:25 UTC (rev 91093)
@@ -40,7 +40,7 @@
import org.osgi.framework.ServiceRegistration;
/**
- * This is a copy of the {@link XMLParserActivatorExt} mentioned in the CVS Header above with added XInclude support.
+ * This is a copy of the {@link XMLParserActivator} mentioned in the CVS Header above with added XInclude support.
*
* Using this copy is a workarround for issue
*
16 years, 5 months
JBoss-OSGI SVN: r91071 - in projects/jboss-osgi/projects: 3rdparty/jaxb/trunk and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 10:35:58 -0400 (Fri, 10 Jul 2009)
New Revision: 91071
Modified:
projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml
projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml
projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
Log:
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
Modified: projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml 2009-07-10 14:15:50 UTC (rev 91070)
+++ projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml 2009-07-10 14:35:58 UTC (rev 91071)
@@ -77,6 +77,7 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.apache.xerces.internal.XercesParserActivator</Bundle-Activator>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Private-Package>
org.jboss.osgi.apache.xerces.internal
</Private-Package>
Modified: projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml 2009-07-10 14:15:50 UTC (rev 91070)
+++ projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml 2009-07-10 14:35:58 UTC (rev 91071)
@@ -60,6 +60,7 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.jaxb.internal.JAXBServiceActivator</Bundle-Activator>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Private-Package>
org.jboss.osgi.jaxb.internal
</Private-Package>
Modified: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-10 14:15:50 UTC (rev 91070)
+++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-10 14:35:58 UTC (rev 91071)
@@ -67,6 +67,7 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.jbossxb.internal.XMLBindingActivator</Bundle-Activator>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Embed-Transitive>true</Embed-Transitive>
<Export-Package>
org.jboss.osgi.jbossxb;version=${version}
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-10 14:15:50 UTC (rev 91070)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-10 14:35:58 UTC (rev 91071)
@@ -81,6 +81,7 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.microcontainer.internal.MicrocontainerServiceActivator</Bundle-Activator>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Export-Package>
org.jboss.osgi.microcontainer;version=${version}
</Export-Package>
16 years, 5 months
JBoss-OSGI SVN: r91068 - in projects/jboss-osgi/projects/bundles: common/trunk/src/main/java/org/jboss/osgi/common/internal and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 08:57:23 -0400 (Fri, 10 Jul 2009)
New Revision: 91068
Removed:
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/
Modified:
projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java
Log:
Report exported packages
Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-07-10 11:02:27 UTC (rev 91067)
+++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-07-10 12:57:23 UTC (rev 91068)
@@ -72,6 +72,7 @@
javax.management,
org.jboss.logging,
org.jboss.osgi.spi.management;version="1.0",
+ org.jboss.osgi.spi.logging;version="1.0",
org.jboss.osgi.spi.service;version="1.0",
org.jboss.osgi.spi.util;version="1.0",
org.osgi.framework;version=1.4,
Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java 2009-07-10 11:02:27 UTC (rev 91067)
+++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java 2009-07-10 12:57:23 UTC (rev 91068)
@@ -28,6 +28,7 @@
import java.util.Map;
import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.spi.logging.ExportedPackageHelper;
import org.jboss.osgi.spi.management.ManagedBundleService;
import org.jboss.osgi.spi.service.DeployerService;
import org.jboss.osgi.spi.service.DeploymentRegistryService;
@@ -98,10 +99,13 @@
if (dep.isAutoStart())
{
+ ExportedPackageHelper packageHelper = new ExportedPackageHelper(context);
try
{
log.log(LogService.LOG_DEBUG, "Start: " + bundle);
bundle.start();
+ log.log(LogService.LOG_INFO, "Started: " + bundle);
+ packageHelper.logExportedPackages(bundle);
}
catch (BundleException ex)
{
16 years, 5 months
JBoss-OSGI SVN: r91067 - in projects/jboss-osgi/trunk: distribution/src/main/resources/installer and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 07:02:27 -0400 (Fri, 10 Jul 2009)
New Revision: 91067
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/hudson/ant.properties.example
Log:
Fix AS integration after config move
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-10 10:46:36 UTC (rev 91066)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-10 11:02:27 UTC (rev 91067)
@@ -66,6 +66,12 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-integration-jbossas</artifactId>
<version>${version.jboss.osgi.integration.jbossas}</version>
+ <classifier>config</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration-jbossas</artifactId>
+ <version>${version.jboss.osgi.integration.jbossas}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
@@ -149,12 +155,6 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<version>${version.jboss.osgi.runtime.equinox}</version>
- <classifier>config</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
- <version>${version.jboss.osgi.runtime.equinox}</version>
<classifier>sources</classifier>
</dependency>
@@ -167,12 +167,6 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version.jboss.osgi.runtime.felix}</version>
- <classifier>config</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
@@ -205,12 +199,6 @@
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
<version>${version.jboss.osgi.runtime.knopflerfish}</version>
- <classifier>config</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
- <version>${version.jboss.osgi.runtime.knopflerfish}</version>
<classifier>sources</classifier>
</dependency>
Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 10:46:36 UTC (rev 91066)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 11:02:27 UTC (rev 91067)
@@ -304,8 +304,8 @@
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <singefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml"
- target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/>
+ <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml"
+ target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
@@ -317,8 +317,8 @@
<include name="org.apache.equinox.framework.jar" />
<include name="org.eclipse.osgi.jar"/>
</fileset>
- <singefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml"
- target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/>
+ <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml"
+ target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.eclipse.osgi.services.jar" />
</fileset>
@@ -329,8 +329,8 @@
<include name="jboss-osgi-runtime-knopflerfish.jar" />
<include name="org.knopflerfish.framework.jar" />
</fileset>
- <singefile condition="isKnopflerfish" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-knopflerfish.xml"
- target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/>
+ <singlefile condition="isKnopflerfish" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-knopflerfish.xml"
+ target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
<fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example
===================================================================
--- projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-07-10 10:46:36 UTC (rev 91066)
+++ projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-07-10 11:02:27 UTC (rev 91067)
@@ -33,4 +33,8 @@
# Hudson (1.290)
apache-tomcat=5.5.27
-sun-hudson=2402/128862
\ No newline at end of file
+sun-hudson=2402/128862
+
+# authentication cancelled error
+# https://hudson.dev.java.net/issues/show_bug.cgi?id=3936
+
16 years, 5 months
JBoss-OSGI SVN: r91064 - in projects/jboss-osgi/trunk: distribution/src/main/resources/installer and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 06:38:27 -0400 (Fri, 10 Jul 2009)
New Revision: 91064
Modified:
projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd
Log:
Move MicrocontainerService to mc bundle
Modified: projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml 2009-07-10 10:31:47 UTC (rev 91063)
+++ projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml 2009-07-10 10:38:27 UTC (rev 91064)
@@ -41,29 +41,13 @@
<!-- resources -->
<dependencySet>
- <outputDirectory>resources/jboss-osgi-runtime-felix</outputDirectory>
+ <outputDirectory>resources/jbossas-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jboss-osgi-runtime-felix:jar:config</include>
+ <include>*:jboss-osgi-integration-jbossas:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
- <dependencySet>
- <outputDirectory>resources/jboss-osgi-runtime-equinox</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:jboss-osgi-runtime-equinox:jar:config</include>
- </includes>
- <unpack>true</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>resources/jboss-osgi-runtime-knopflerfish</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:jboss-osgi-runtime-knopflerfish:jar:config</include>
- </includes>
- <unpack>true</unpack>
- </dependencySet>
<!-- source -->
<dependencySet>
Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 10:31:47 UTC (rev 91063)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 10:38:27 UTC (rev 91064)
@@ -304,9 +304,8 @@
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
+ <singefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml"
+ target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/>
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
@@ -318,9 +317,8 @@
<include name="org.apache.equinox.framework.jar" />
<include name="org.eclipse.osgi.jar"/>
</fileset>
- <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
+ <singefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml"
+ target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.eclipse.osgi.services.jar" />
</fileset>
@@ -331,9 +329,8 @@
<include name="jboss-osgi-runtime-knopflerfish.jar" />
<include name="org.knopflerfish.framework.jar" />
</fileset>
- <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
+ <singefile condition="isKnopflerfish" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-knopflerfish.xml"
+ target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/>
<fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2009-07-10 10:31:47 UTC (rev 91063)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2009-07-10 10:38:27 UTC (rev 91064)
@@ -6,4 +6,4 @@
Export-Package: org.jboss.test.osgi.example.microcontainer.bundleA
-Import-Package: org.jboss.test.osgi.example.microcontainer.bundleB, org.jboss.osgi.spi.service, org.osgi.framework
+Import-Package: org.jboss.test.osgi.example.microcontainer.bundleB, org.jboss.osgi.microcontainer, org.osgi.framework
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd 2009-07-10 10:31:47 UTC (rev 91063)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd 2009-07-10 10:38:27 UTC (rev 91064)
@@ -6,4 +6,4 @@
Export-Package: org.jboss.test.osgi.service.microcontainer.bundleA
-Import-Package: org.jboss.osgi.spi.service, org.osgi.framework
+Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework
16 years, 5 months
JBoss-OSGI SVN: r91063 - projects/jboss-osgi/projects/integration/jbossas/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 06:31:47 -0400 (Fri, 10 Jul 2009)
New Revision: 91063
Modified:
projects/jboss-osgi/projects/integration/jbossas/trunk/.classpath
Log:
Add resources to .classpath
Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/integration/jbossas/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
+++ projects/jboss-osgi/projects/integration/jbossas/trunk/.classpath 2009-07-10 10:31:47 UTC (rev 91063)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
16 years, 5 months
JBoss-OSGI SVN: r91062 - in projects/jboss-osgi/projects/runtime: equinox/trunk/src/main and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 06:25:48 -0400 (Fri, 10 Jul 2009)
New Revision: 91062
Removed:
projects/jboss-osgi/projects/runtime/equinox/trunk/scripts/
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/resources/
projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/scripts/
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/src/main/resources/
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/.classpath
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml
Log:
Move beans config to AS integration
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -49,32 +49,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/.classpath 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -76,29 +76,8 @@
</descriptors>
</configuration>
</execution>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
- <id>config</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*beans.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -50,32 +50,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
16 years, 5 months
JBoss-OSGI SVN: r91061 - in projects/jboss-osgi/projects/integration/jbossas/trunk: scripts and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 06:24:31 -0400 (Fri, 10 Jul 2009)
New Revision: 91061
Added:
projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/
projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml
projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/
projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml
projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml
Modified:
projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml
Log:
Migrate AS integration to here
Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 10:17:08 UTC (rev 91060)
+++ projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
@@ -33,6 +33,24 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-config.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -63,6 +81,14 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>jboss-beans-*.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Added: projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml
===================================================================
--- projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml (rev 0)
+++ projects/jboss-osgi/projects/integration/jbossas/trunk/scripts/assembly-config.xml 2009-07-10 10:24:31 UTC (rev 91061)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <id>config</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jboss-beans-*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml (from rev 91048, projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/resources/osgi-deployers-jboss-beans.xml)
===================================================================
--- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml (rev 0)
+++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-equinox.xml 2009-07-10 10:24:31 UTC (rev 91061)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ $Id$
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ ********************************
+ * *
+ * Framework *
+ * *
+ ********************************
+ -->
+
+ <!-- The OSGiFramework -->
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+ <property name="properties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+ <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry>
+ <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry>
+ <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
+ <entry>
+ <key>org.osgi.framework.system.packages</key>
+ <value>
+ <!-- system -->
+ javax.management,
+ javax.xml.parsers,
+ org.xml.sax,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.logging;version=1.0,
+ org.jboss.osgi.spi.management;version=1.0,
+ org.jboss.osgi.spi.service;version=1.0,
+ org.jboss.osgi.spi.testing;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
+
+ <!-- jboss -->
+ org.jboss.logging
+ </value>
+ </entry>
+ <!--
+ If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
+ If set to 'false' bundles must be deployed in the order that is required to start them.
+ -->
+ <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
+ </map>
+ </property>
+ <property name="autoInstall">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/osgi/org.eclipse.osgi.services.jar</value>
+ </list>
+ </property>
+ <property name="autoStart">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value>
+ <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- The Framework Management -->
+ <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Services *
+ * *
+ ********************************
+ -->
+
+ <!-- Microcontainer Service -->
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Deployers *
+ * *
+ ********************************
+ -->
+
+ <!-- The OSGi MetaData Deployer -->
+ <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
+
+ <!-- The OSGi Bundle Structure Deployer -->
+ <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+
+ <!-- The OSGi Bundle Deployer -->
+ <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
+ </bean>
+
+ <!-- The Bundle ClassLoader Deployer -->
+ <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Start/Stop Deployer -->
+ <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Management Deployer -->
+ <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Copied: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml (from rev 91048, projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml)
===================================================================
--- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml (rev 0)
+++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-07-10 10:24:31 UTC (rev 91061)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ $Id$
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ ********************************
+ * *
+ * Framework *
+ * *
+ ********************************
+ -->
+
+ <!-- The OSGiFramework -->
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+ <property name="properties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+ <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
+ <entry>
+ <key>org.osgi.framework.system.packages.extra</key>
+ <value>
+ <!-- system -->
+ org.apache.xerces.dom,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.jmx;version=1.0,
+ org.jboss.osgi.jndi;version=1.0,
+ org.jboss.osgi.microcontainer;version=1.0,
+ org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.logging;version=1.0,
+ org.jboss.osgi.spi.management;version=1.0,
+ org.jboss.osgi.spi.service;version=1.0,
+ org.jboss.osgi.spi.testing;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
+
+ <!-- jboss -->
+ org.jboss.beans.metadata.plugins;version=2.0,
+ org.jboss.beans.metadata.plugins.builder;version=2.0,
+ org.jboss.beans.metadata.spi.builder;version=2.0,
+ org.jboss.beans.metadata.spi;version=2.0,
+ org.jboss.dependency.spi;version=2.0,
+ org.jboss.kernel.spi.dependency;version=2.0,
+ org.jboss.logging,
+ org.jboss.virtual,
+ org.jboss.virtual.plugins.registry,
+ org.jboss.virtual.plugins.context.jar,
+ org.jboss.virtual.plugins.vfs.helpers,
+ org.jboss.virtual.protocol,
+ org.jboss.xb.binding;version=2.0,
+ org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
+ </value>
+ </entry>
+ <!--
+ If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
+ If set to 'false' bundles must be deployed in the order that is required to start them.
+ -->
+ <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
+ <!--
+ Setup remote logging
+ -->
+ <entry><key>org.jboss.osgi.service.remote.log.sender</key><value>true</value></entry>
+ <entry><key>org.jboss.osgi.service.remote.log.host</key><value>${jboss.bind.address}</value></entry>
+ <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry>
+ <!--
+ Husky socket connector properties
+ -->
+ <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
+ <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+ </map>
+ </property>
+ <property name="autoInstall">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
+ </list>
+ </property>
+ <property name="autoStart">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value>
+ <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- The Framework Management -->
+ <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Services *
+ * *
+ ********************************
+ -->
+
+ <!-- Microcontainer Service -->
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Deployers *
+ * *
+ ********************************
+ -->
+
+ <!-- The OSGi MetaData Deployer -->
+ <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
+
+ <!-- The OSGi Bundle Structure Deployer -->
+ <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+
+ <!-- The OSGi Bundle Deployer -->
+ <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
+ </bean>
+
+ <!-- The Bundle ClassLoader Deployer -->
+ <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Start/Stop Deployer -->
+ <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Management Deployer -->
+ <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Copied: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml (from rev 91048, projects/jboss-osgi/projects/runtime/knopflerfish/trunk/src/main/resources/osgi-deployers-jboss-beans.xml)
===================================================================
--- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml (rev 0)
+++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/resources/jboss-beans-knopflerfish.xml 2009-07-10 10:24:31 UTC (rev 91061)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ $Id$
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ ********************************
+ * *
+ * Framework *
+ * *
+ ********************************
+ -->
+
+ <!-- The OSGiFramework -->
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration">
+ <property name="properties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+ <entry><key>org.osgi.framework.dir</key><value>${jboss.server.data.dir}/knopflerfish</value></entry>
+ <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
+ <entry>
+ <key>org.osgi.framework.system.packages</key>
+ <value>
+ <!-- system -->
+ javax.management,
+ javax.xml.parsers,
+ org.xml.sax,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.logging;version=1.0,
+ org.jboss.osgi.spi.management;version=1.0,
+ org.jboss.osgi.spi.service;version=1.0,
+ org.jboss.osgi.spi.testing;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
+
+ <!-- jboss -->
+ org.jboss.logging,
+ org.jboss.xb.binding;version=2.0,
+ org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
+
+ <!-- core -->
+ org.osgi.framework;version=1.4,
+ org.osgi.service.packageadmin;version=1.2,
+ org.osgi.service.startlevel;version=1.1
+ </value>
+ </entry>
+ <!--
+ If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
+ If set to 'false' bundles must be deployed in the order that is required to start them.
+ -->
+ <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
+ </map>
+ </property>
+ <property name="autoInstall">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
+ </list>
+ </property>
+ <property name="autoStart">
+ <list elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value>
+ <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- The Framework Management -->
+ <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Services *
+ * *
+ ********************************
+ -->
+
+ <!-- Microcontainer Service -->
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * Deployers *
+ * *
+ ********************************
+ -->
+
+ <!-- The OSGi MetaData Deployer -->
+ <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
+
+ <!-- The OSGi Bundle Structure Deployer -->
+ <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+
+ <!-- The OSGi Bundle Deployer -->
+ <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
+ </bean>
+
+ <!-- The Bundle ClassLoader Deployer -->
+ <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Start/Stop Deployer -->
+ <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Management Deployer -->
+ <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+</deployment>
\ No newline at end of file
16 years, 5 months
JBoss-OSGI SVN: r91059 - in projects/jboss-osgi/trunk: testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-10 06:04:59 -0400 (Fri, 10 Jul 2009)
New Revision: 91059
Modified:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java
Log:
Move MicrocontainerService to mc bundle
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java 2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java 2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,7 +23,7 @@
//$Id$
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_KERNEL_CONTROLLER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL_CONTROLLER;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.dependency.spi.ControllerContext;
@@ -31,7 +31,7 @@
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.osgi.blueprint.BlueprintContext;
import org.jboss.osgi.blueprint.reflect.ComponentMetadataImpl;
-import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java 2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java 2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.jboss.test.osgi.example.microcontainer.bundleB.SomeBean;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,12 +23,12 @@
//$Id$
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MBEAN_SERVER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
import static org.jboss.osgi.spi.management.ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK;
import static org.jboss.osgi.spi.management.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE;
import static org.jboss.osgi.spi.service.DeployerService.MBEAN_DEPLOYER_SERVICE;
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_KERNEL;
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_MBEAN_SERVER;
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
import static org.jboss.test.osgi.service.microcontainer.bundleB.SomeBeanMBean.MBEAN_NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -41,11 +41,11 @@
import org.jboss.osgi.jndi.JNDICapability;
import org.jboss.osgi.microcontainer.MicrocontainerCapability;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.jboss.osgi.spi.management.MBeanProxy;
import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
import org.jboss.osgi.spi.service.DeployerService;
-import org.jboss.osgi.spi.service.MicrocontainerService;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java 2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java 2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,9 +23,9 @@
//$Id$
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
-import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
16 years, 5 months