JBoss-OSGI SVN: r100355 - in projects/jboss-osgi: projects/bundles/webapp/trunk and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-03 12:04:42 -0500 (Wed, 03 Feb 2010)
New Revision: 100355
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
Log:
[JBOSGI-287] Optional import loaded from system classloader
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-03 17:04:42 UTC (rev 100355)
@@ -111,6 +111,7 @@
log.debug("Skip bundle: " + location);
}
}
+
// Start the capability bundles
for (OSGiBundle bundle : installed)
{
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2010-02-03 17:04:42 UTC (rev 100355)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-webapp</artifactId>
<packaging>bundle</packaging>
- <version>0.7.3-SNAPSHOT</version>
+ <version>0.7.2.SP1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -39,7 +39,7 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
+ <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-02-03 17:04:42 UTC (rev 100355)
@@ -56,19 +56,22 @@
*/
public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy
{
+ /** The associated bundle state */
+ private AbstractBundleState bundleState;
/** The fragment roots */
private List<VirtualFile> fragments;
- public OSGiClassLoaderPolicy(AbstractBundleState absBundleState, VirtualFile[] roots)
+ public OSGiClassLoaderPolicy(AbstractBundleState bundleState, VirtualFile[] roots)
{
super(roots);
- if (absBundleState == null)
+ if (bundleState == null)
throw new IllegalArgumentException("Null bundleState");
-
- if (absBundleState instanceof AbstractDeployedBundleState)
+ this.bundleState = bundleState;
+
+ if (bundleState instanceof AbstractDeployedBundleState)
{
- AbstractDeployedBundleState depBundleState = (AbstractDeployedBundleState)absBundleState;
+ AbstractDeployedBundleState depBundleState = (AbstractDeployedBundleState)bundleState;
DeploymentUnit unit = depBundleState.getDeploymentUnit();
Module module = unit.getAttachment(Module.class);
if (module instanceof OSGiModule == false)
@@ -91,6 +94,13 @@
}
}
+
+ @Override
+ public String getName()
+ {
+ return bundleState.getCanonicalName();
+ }
+
/**
* Processes the NativeLibraryMetaData that is part of the OSGiClassLoadingMetaData
* and adds the NativeLibraryProviders to the ClassLoaderPolicy
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java 2010-02-03 17:04:42 UTC (rev 100355)
@@ -31,6 +31,7 @@
*
* It is ignored if the {@link HttpService} is already registered.
*
+ * Dependent Capability: {@link ConfigAdminCapability}
* Installed bundles: pax-web-jetty-bundle.jar
*
* Default properties set by this capability
@@ -49,7 +50,7 @@
{
super(HttpService.class.getName());
addSystemProperty("org.osgi.service.http.port", "8090");
-
+ addDependency(new ConfigAdminCapability());
addBundle("bundles/pax-web-jetty-bundle.jar");
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-03 17:04:42 UTC (rev 100355)
@@ -63,6 +63,9 @@
public static ObjectName getObjectName(Bundle bundle)
{
+ if (bundle == null)
+ throw new IllegalArgumentException("Null bundle");
+
long id = bundle.getBundleId();
String name = bundle.getSymbolicName();
Version version = bundle.getVersion();
@@ -144,7 +147,7 @@
ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
PackageAdmin packageAdmin = (PackageAdmin)context.getService(sref);
Bundle providingBundle = packageAdmin.getBundle(clazz);
- return getObjectName(providingBundle);
+ return providingBundle != null ? getObjectName(providingBundle) : null;
}
public File getDataFile(String filename)
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-03 17:04:42 UTC (rev 100355)
@@ -21,6 +21,10 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
+ <!-- [JBOSGI-287] Optional import loaded from system classloader -->
+ javax.servlet,
+ javax.servlet.http,
+
<!-- loging -->
org.apache.log4j;version=1.2,
org.slf4j;version=1.5,
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-03 17:04:42 UTC (rev 100355)
@@ -71,7 +71,7 @@
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.serviceloader>1.0.0-SNAPSHOT</version.jboss.osgi.serviceloader>
<version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.webapp>0.7.2</version.jboss.osgi.webapp>
+ <version.jboss.osgi.webapp>0.7.2.SP1-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-03 16:54:19 UTC (rev 100354)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-03 17:04:42 UTC (rev 100355)
@@ -55,20 +55,6 @@
********************************
-->
- <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- <property name="autoInstall">
- <list elementClass="java.net.URL">
- <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value>
- </list>
- </property>
- <property name="autoStart">
- <list elementClass="java.net.URL">
- <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value>
- <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value>
- </list>
- </property>
- </bean>
<bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager" /></parameter>
14 years, 5 months
JBoss-OSGI SVN: r100330 - projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-03 03:31:45 -0500 (Wed, 03 Feb 2010)
New Revision: 100330
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
Log:
Improve remote getStatus() error handling
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-03 08:02:56 UTC (rev 100329)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-03 08:31:45 UTC (rev 100330)
@@ -31,6 +31,7 @@
import java.net.URLStreamHandler;
import java.util.Dictionary;
+import javax.management.InstanceNotFoundException;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -106,10 +107,19 @@
MBeanServerConnection server = getRuntime().getMBeanServer();
isRegistered = server.isRegistered(objectName);
}
- catch (IOException e)
+ catch (RuntimeException rte)
{
+ Throwable cause = rte.getCause() != null ? rte.getCause() : null;
+ if (cause instanceof InstanceNotFoundException == false)
+ log.warn("Cannot get state for: " + objectName, cause);
+
isRegistered = false;
}
+ catch (IOException ex)
+ {
+ log.warn("Cannot get state for: " + objectName, ex);
+ isRegistered = false;
+ }
return isRegistered ? bundle.getState() : Bundle.UNINSTALLED;
}
14 years, 5 months
JBoss-OSGI SVN: r100326 - projects/jboss-osgi/trunk/hudson.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-03 02:31:16 -0500 (Wed, 03 Feb 2010)
New Revision: 100326
Modified:
projects/jboss-osgi/trunk/hudson/build.xml
Log:
Echo jboss.bind.address
Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml 2010-02-03 07:29:30 UTC (rev 100325)
+++ projects/jboss-osgi/trunk/hudson/build.xml 2010-02-03 07:31:16 UTC (rev 100326)
@@ -181,8 +181,8 @@
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson setup successfully *"/>
- <echo message="* ant hudson-start *"/>
+ <echo message="* Hudson setup successfully "/>
+ <echo message="* ant hudson-start "/>
<echo message="*************************************"/>
<echo/>
@@ -196,8 +196,8 @@
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson stopped successfully *"/>
- <echo message="* ant hudson-start *"/>
+ <echo message="* Hudson stopped successfully "/>
+ <echo message="* ant hudson-start "/>
<echo message="*************************************"/>
<echo/>
@@ -215,8 +215,8 @@
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson started successfully *"/>
- <echo message="* http://${jboss.bind.address}:${hudson.http.port}/hudson *"/>
+ <echo message="* Hudson started successfully "/>
+ <echo message="* http://${jboss.bind.address}:${hudson.http.port}/hudson"/>
<echo message="*************************************"/>
<echo/>
14 years, 5 months
JBoss-OSGI SVN: r100325 - projects/jboss-osgi/trunk/hudson.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-03 02:29:30 -0500 (Wed, 03 Feb 2010)
New Revision: 100325
Modified:
projects/jboss-osgi/trunk/hudson/build.xml
Log:
Echo jboss.bind.address
Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml 2010-02-03 07:05:32 UTC (rev 100324)
+++ projects/jboss-osgi/trunk/hudson/build.xml 2010-02-03 07:29:30 UTC (rev 100325)
@@ -216,7 +216,7 @@
<echo/>
<echo message="*************************************"/>
<echo message="* Hudson started successfully *"/>
- <echo message="* http://localhost:${hudson.http.port}/hudson *"/>
+ <echo message="* http://${jboss.bind.address}:${hudson.http.port}/hudson *"/>
<echo message="*************************************"/>
<echo/>
14 years, 5 months
JBoss-OSGI SVN: r100286 - projects/jboss-osgi/trunk/hudson.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-02 14:24:48 -0500 (Tue, 02 Feb 2010)
New Revision: 100286
Modified:
projects/jboss-osgi/trunk/hudson/build.xml
Log:
Fix hudson-setup
Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml 2010-02-02 19:17:54 UTC (rev 100285)
+++ projects/jboss-osgi/trunk/hudson/build.xml 2010-02-02 19:24:48 UTC (rev 100286)
@@ -40,6 +40,7 @@
<!-- ================================================================== -->
<target name="init">
+
<!-- Check if ant.properties is available -->
<available property="ant.properties.available" file="${basedir}/ant.properties"/>
<fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
@@ -61,6 +62,7 @@
<property name="hudson.jboss" value="${hudson.root}/jboss"/>
<echo/>
+ <echo message="hudson.user = ${hudson.username}"/>
<echo message="hudson.root = ${hudson.root}"/>
<echo message="hudson.home = ${hudson.home}"/>
<echo/>
@@ -163,12 +165,13 @@
</copy>
<!-- Configure Hudson Home -->
- <copy todir="${hudson.home}" overwrite="false">
+ <copy todir="${hudson.home}" overwrite="true">
<fileset dir="${hudson.dir}/hudson-home">
<include name="*.xml"/>
</fileset>
<filterset>
<filter token="version.id" value="${version.id}"/>
+ <filter token="hudson.username" value="${hudson.username}"/>
<filtersfile file="${hudson.dir}/ant.properties"/>
</filterset>
</copy>
14 years, 5 months
JBoss-OSGI SVN: r100242 - projects/jboss-osgi/trunk/testsuite/example.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-02 01:29:47 -0500 (Tue, 02 Feb 2010)
New Revision: 100242
Modified:
projects/jboss-osgi/trunk/testsuite/example/pom.xml
Log:
[JBOSGI-145] JAXB classes are loaded from the system classpath
Exclude for equinox
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-02 06:28:21 UTC (rev 100241)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-02 06:29:47 UTC (rev 100242)
@@ -182,6 +182,8 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
+ <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
+ <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>
<!-- [JBOSGI-236] XML Binding example fails in JBossAS -->
<exclude>org/jboss/test/osgi/example/xml/jbossxb/**</exclude>
<!-- Functionality not supported in Equinox -->
14 years, 5 months
JBoss-OSGI SVN: r100238 - in projects/jboss-osgi/trunk/testsuite/functional: src/test/java/org/jboss/test/osgi/jbosgi286 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-02 01:00:10 -0500 (Tue, 02 Feb 2010)
New Revision: 100238
Modified:
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java
Log:
[JBOSGI-286] Investigate classloading of javax.* classes
Fix typo
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-02 05:52:28 UTC (rev 100237)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-02 06:00:10 UTC (rev 100238)
@@ -171,8 +171,8 @@
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
<!-- [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath -->
<exclude>org/jboss/test/osgi/jbosgi214/**</exclude>
- <!-- [JBOSGI-268] Investigate classloading of javax.* classes -->
- <exclude>org/jboss/test/osgi/jbosgi268/**</exclude>
+ <!-- [JBOSGI-286] Investigate classloading of javax.* classes -->
+ <exclude>org/jboss/test/osgi/jbosgi286/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java 2010-02-02 05:52:28 UTC (rev 100237)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java 2010-02-02 06:00:10 UTC (rev 100238)
@@ -41,7 +41,7 @@
public class OSGi286TestCase extends OSGiTest
{
@Test
- public void testInstallInvalidBundleVersion() throws Exception
+ public void testJAXBContextWiring() throws Exception
{
OSGiRuntime runtime = getDefaultRuntime();
try
14 years, 5 months
JBoss-OSGI SVN: r100237 - in projects/jboss-osgi/projects/runtime/framework/trunk/src: main/java/org/jboss/osgi/framework/classloading and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-02 00:52:28 -0500 (Tue, 02 Feb 2010)
New Revision: 100237
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java
Log:
Add OSGiCoreClassFilter to remove redundancy
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -87,7 +87,7 @@
public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse)
{
- log.warn("[JBOSGI-138] findEntries(" + path + "," + filePattern + "," + recurse + ")");
+ System.out.println("FIXME [JBOSGI-138] findEntries(" + path + "," + filePattern + "," + recurse + ")");
return null;
// [Bug-1472] Clarify the semantic of resource API when called on the system bundle
@@ -115,27 +115,27 @@
public URL getEntry(String path)
{
- log.warn("[JBOSGI-138] getEntry(" + path + ")");
+ System.out.println("FIXME [JBOSGI-138] getEntry(" + path + ")");
return null;
}
@SuppressWarnings("rawtypes")
public Enumeration getEntryPaths(String path)
{
- log.warn("[JBOSGI-138] getEntryPaths(" + path + ")");
+ System.out.println("FIXME [JBOSGI-138] getEntryPaths(" + path + ")");
return null;
}
public URL getResource(String name)
{
- log.warn("[JBOSGI-138] getResource(" + name + ")");
+ System.out.println("FIXME [JBOSGI-138] getResource(" + name + ")");
return null;
}
@SuppressWarnings("rawtypes")
public Enumeration getResources(String name) throws IOException
{
- log.warn("[JBOSGI-138] getResources(" + name + ")");
+ System.out.println("FIXME [JBOSGI-138] getResources(" + name + ")");
return null;
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -57,29 +57,6 @@
private List<URL> classPath = new ArrayList<URL>();
/**
- * Return a filter for all packages defined in the org.osgi.core.jar
- * and java.* but not javax.*
- */
- static ClassFilter getClassLoaderDomainFilter()
- {
- // Filter the list of org.osgi.core packages
- ArrayList<String> corePackages = new ArrayList<String>();
- corePackages.add("org.osgi.framework");
- corePackages.add("org.osgi.framework.hooks");
- corePackages.add("org.osgi.framework.hooks.service");
- corePackages.add("org.osgi.framework.launch");
- corePackages.add("org.osgi.service.condpermadmin");
- corePackages.add("org.osgi.service.packageadmin");
- corePackages.add("org.osgi.service.permissionadmin");
- corePackages.add("org.osgi.service.startlevel");
- corePackages.add("org.osgi.service.url");
- ClassFilter osgiFilter = PackageClassFilter.createPackageClassFilter(corePackages);
- // Filter java.* but not javax.*
- ClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
- return CombiningClassFilter.create(javaFilter, osgiFilter);
- }
-
- /**
* Create a new OSGiClassLoaderDomain.
* @param domainName the domain name
* @throws IllegalArgumentException for a null bundle manager
@@ -124,7 +101,8 @@
// Initialize the configured system packages
ClassFilter systemFilter = PackageClassFilter.createPackageClassFilterFromString(getSystemPackagesAsString());
- ClassFilter filter = CombiningClassFilter.create(getClassLoaderDomainFilter(), systemFilter);
+ ClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
+ ClassFilter filter = CombiningClassFilter.create(javaFilter, OSGiCoreClassFilter.INSTANCE, systemFilter);
// Setup the domain's parent policy
setParentPolicy(new ParentPolicy(filter, ClassFilterUtils.NOTHING));
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -22,6 +22,7 @@
package org.jboss.osgi.framework.classloading;
+import org.jboss.classloader.plugins.filter.CombiningClassFilter;
import org.jboss.classloader.plugins.jdk.AbstractJDKChecker;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderPolicy;
@@ -30,6 +31,7 @@
import org.jboss.classloader.spi.base.BaseClassLoader;
import org.jboss.classloader.spi.filter.ClassFilter;
import org.jboss.classloader.spi.filter.ClassFilterUtils;
+import org.jboss.classloader.spi.filter.RecursivePackageClassFilter;
import org.jboss.osgi.framework.bundle.AbstractBundleState;
import org.jboss.osgi.framework.bundle.OSGiBundleState;
@@ -49,8 +51,9 @@
{
ClassLoaderDomain domain = getDefaultDomain();
- ClassFilter domainFilter = OSGiClassLoaderDomain.getClassLoaderDomainFilter();
- domain.setParentPolicy(new ParentPolicy(domainFilter, ClassFilterUtils.NOTHING));
+ ClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
+ ClassFilter filter = CombiningClassFilter.create(javaFilter, OSGiCoreClassFilter.INSTANCE);
+ domain.setParentPolicy(new ParentPolicy(filter, ClassFilterUtils.NOTHING));
AbstractJDKChecker.getExcluded().add(AbstractBundleState.class);
AbstractJDKChecker.getExcluded().add(OSGiBundleState.class);
Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -0,0 +1,72 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.framework.classloading;
+
+// $Id: $
+
+import org.jboss.classloader.spi.filter.PackageClassFilter;
+
+/**
+ * A class filter for OSGi Core packages.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 02-Feb-2010
+ */
+public final class OSGiCoreClassFilter extends PackageClassFilter
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 5679852972501066041L;
+
+ /** The singleton instance */
+ public static OSGiCoreClassFilter INSTANCE = new OSGiCoreClassFilter();
+
+ private OSGiCoreClassFilter()
+ {
+ super(getCorePackages());
+ }
+
+ public static String[] getCorePackages()
+ {
+ return new String[] {
+ "org.osgi.framework",
+ "org.osgi.framework.hooks",
+ "org.osgi.framework.hooks.service",
+ "org.osgi.framework.launch",
+ "org.osgi.service.condpermadmin",
+ "org.osgi.service.packageadmin",
+ "org.osgi.service.permissionadmin",
+ "org.osgi.service.startlevel",
+ "org.osgi.service.url"
+ };
+ }
+
+ public String toString()
+ {
+ return "OSGI_CORE";
+ }
+
+ @Override
+ public void setIncludeJava(boolean includeJava)
+ {
+ throw new UnsupportedOperationException("Cannot modify OSGi Core Filter");
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -24,11 +24,13 @@
//$Id$
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.jboss.logging.Logger;
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
+import org.jboss.osgi.framework.classloading.OSGiCoreClassFilter;
import org.jboss.osgi.framework.plugins.SystemPackagesPlugin;
import org.osgi.framework.Constants;
@@ -92,6 +94,9 @@
allPackages.add("org.jboss.virtual");
+ String[] corePackages = OSGiCoreClassFilter.getCorePackages();
+ allPackageNames.addAll(Arrays.asList(corePackages));
+
allPackages.add("org.w3c.dom");
allPackages.add("org.w3c.dom.bootstrap");
allPackages.add("org.w3c.dom.ls");
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -67,12 +67,12 @@
public void testStartStop() throws Exception
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testUpdate() throws Exception
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testUninstall() throws Exception
@@ -108,31 +108,31 @@
public void testGetEntry()
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testGetEntryPath()
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testFindEntries()
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testLoadClass()
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testGetResource()
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
public void testGetResources()
{
- System.out.println("[JBOSGI-138] Proper system BundleContext implementation");
+ System.out.println("FIXME [JBOSGI-138] Proper system BundleContext implementation");
}
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -99,7 +99,7 @@
PackageAdminPlugin packageAdmin = bundleManager.getPlugin(PackageAdminPlugin.class);
packageAdmin.resolveBundles(null);
- System.out.println("[JBOSGI-151] Cannot resolve circular dependencies");
+ System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies");
//assertTrue("All bundles resolved", allResoved);
}
finally
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java 2010-02-02 05:28:02 UTC (rev 100236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java 2010-02-02 05:52:28 UTC (rev 100237)
@@ -56,13 +56,13 @@
public void testNoManifest() throws Exception
{
- System.out.println("[JBOSGI-203] Define non OSGi bundle handling by the Framework");
+ System.out.println("FIXME [JBOSGI-203] Define non OSGi bundle handling by the Framework");
// testBundle("smoke-no-manifest", Bundle.ACTIVE);
}
public void testNonOSGiManifest() throws Exception
{
- System.out.println("[JBOSGI-203] Define non OSGi bundle handling by the Framework");
+ System.out.println("FIXME [JBOSGI-203] Define non OSGi bundle handling by the Framework");
// testBundle("smoke-non-osgi-manifest", Bundle.ACTIVE);
}
@@ -90,13 +90,13 @@
public void testDeployedNoManifest() throws Exception
{
- System.out.println("[JBOSGI-203] Define non OSGi bundle handling by the Framework");
+ System.out.println("FIXME [JBOSGI-203] Define non OSGi bundle handling by the Framework");
// testDeployedBundle("smoke-no-manifest", Bundle.ACTIVE);
}
public void testDeployedNonOSGiManifest() throws Exception
{
- System.out.println("[JBOSGI-203] Define non OSGi bundle handling by the Framework");
+ System.out.println("FIXME [JBOSGI-203] Define non OSGi bundle handling by the Framework");
// testDeployedBundle("smoke-non-osgi-manifest", Bundle.ACTIVE);
}
@@ -128,7 +128,7 @@
public void testAssembledNonOSGiDeployment() throws Exception
{
- System.out.println("[JBOSGI-203] Define non OSGi bundle handling by the Framework");
+ System.out.println("FIXME [JBOSGI-203] Define non OSGi bundle handling by the Framework");
/*
Bundle bundle = deployBundle("smoke-non-osgi-deployment", A.class);
try
14 years, 5 months
JBoss-OSGI SVN: r100234 - in projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework: plugins/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-02 00:01:18 -0500 (Tue, 02 Feb 2010)
New Revision: 100234
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
Log:
Filter org.osgi.core packages in CLSystem
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-02-02 05:00:14 UTC (rev 100233)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-02-02 05:01:18 UTC (rev 100234)
@@ -29,12 +29,12 @@
import java.util.List;
import org.jboss.classloader.plugins.filter.CombiningClassFilter;
-import org.jboss.classloader.plugins.filter.PatternClassFilter;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
+import org.jboss.classloader.spi.filter.ClassFilter;
import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloader.spi.filter.RecursivePackageClassFilter;
@@ -57,6 +57,29 @@
private List<URL> classPath = new ArrayList<URL>();
/**
+ * Return a filter for all packages defined in the org.osgi.core.jar
+ * and java.* but not javax.*
+ */
+ static ClassFilter getClassLoaderDomainFilter()
+ {
+ // Filter the list of org.osgi.core packages
+ ArrayList<String> corePackages = new ArrayList<String>();
+ corePackages.add("org.osgi.framework");
+ corePackages.add("org.osgi.framework.hooks");
+ corePackages.add("org.osgi.framework.hooks.service");
+ corePackages.add("org.osgi.framework.launch");
+ corePackages.add("org.osgi.service.condpermadmin");
+ corePackages.add("org.osgi.service.packageadmin");
+ corePackages.add("org.osgi.service.permissionadmin");
+ corePackages.add("org.osgi.service.startlevel");
+ corePackages.add("org.osgi.service.url");
+ ClassFilter osgiFilter = PackageClassFilter.createPackageClassFilter(corePackages);
+ // Filter java.* but not javax.*
+ ClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
+ return CombiningClassFilter.create(javaFilter, osgiFilter);
+ }
+
+ /**
* Create a new OSGiClassLoaderDomain.
* @param domainName the domain name
* @throws IllegalArgumentException for a null bundle manager
@@ -100,10 +123,8 @@
classLoaderSystem.registerDomain(this);
// Initialize the configured system packages
- String filteredPackages = getSystemPackagesAsString();
- PackageClassFilter systemFilter = PackageClassFilter.createPackageClassFilterFromString(filteredPackages);
- PatternClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
- CombiningClassFilter filter = CombiningClassFilter.create(javaFilter, systemFilter);
+ ClassFilter systemFilter = PackageClassFilter.createPackageClassFilterFromString(getSystemPackagesAsString());
+ ClassFilter filter = CombiningClassFilter.create(getClassLoaderDomainFilter(), systemFilter);
// Setup the domain's parent policy
setParentPolicy(new ParentPolicy(filter, ClassFilterUtils.NOTHING));
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java 2010-02-02 05:00:14 UTC (rev 100233)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java 2010-02-02 05:01:18 UTC (rev 100234)
@@ -21,15 +21,15 @@
*/
package org.jboss.osgi.framework.classloading;
-import org.jboss.classloader.plugins.filter.PatternClassFilter;
+
import org.jboss.classloader.plugins.jdk.AbstractJDKChecker;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
+import org.jboss.classloader.spi.filter.ClassFilter;
import org.jboss.classloader.spi.filter.ClassFilterUtils;
-import org.jboss.classloader.spi.filter.RecursivePackageClassFilter;
import org.jboss.osgi.framework.bundle.AbstractBundleState;
import org.jboss.osgi.framework.bundle.OSGiBundleState;
@@ -49,8 +49,8 @@
{
ClassLoaderDomain domain = getDefaultDomain();
- PatternClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
- domain.setParentPolicy(new ParentPolicy(javaFilter, ClassFilterUtils.NOTHING));
+ ClassFilter domainFilter = OSGiClassLoaderDomain.getClassLoaderDomainFilter();
+ domain.setParentPolicy(new ParentPolicy(domainFilter, ClassFilterUtils.NOTHING));
AbstractJDKChecker.getExcluded().add(AbstractBundleState.class);
AbstractJDKChecker.getExcluded().add(OSGiBundleState.class);
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-02-02 05:00:14 UTC (rev 100233)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-02-02 05:01:18 UTC (rev 100234)
@@ -92,16 +92,6 @@
allPackages.add("org.jboss.virtual");
- allPackages.add("org.osgi.framework");
- allPackages.add("org.osgi.framework.hooks");
- allPackages.add("org.osgi.framework.hooks.service");
- allPackages.add("org.osgi.framework.launch");
- allPackages.add("org.osgi.service.condpermadmin");
- allPackages.add("org.osgi.service.packageadmin");
- allPackages.add("org.osgi.service.permissionadmin");
- allPackages.add("org.osgi.service.startlevel");
- allPackages.add("org.osgi.service.url");
-
allPackages.add("org.w3c.dom");
allPackages.add("org.w3c.dom.bootstrap");
allPackages.add("org.w3c.dom.ls");
14 years, 5 months
JBoss-OSGI SVN: r100230 - projects/jboss-osgi/trunk/reactor.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-01 23:24:47 -0500 (Mon, 01 Feb 2010)
New Revision: 100230
Modified:
projects/jboss-osgi/trunk/reactor/pom.xml
Log:
Disable mcframework build for felix & equinox
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2010-02-02 01:50:43 UTC (rev 100229)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2010-02-02 04:24:47 UTC (rev 100230)
@@ -44,20 +44,32 @@
<profiles>
<!--
- Name: externals
- Descr: Build the external reactor projects
+ Name: framework-jbossmc
+ Descr: Build the JBossMC Framework
-->
<profile>
- <id>externals</id>
+ <id>framework-jbossmc</id>
<activation>
<property>
- <name>!noexternals</name>
+ <name>framework</name>
+ <value>jbossmc</value>
</property>
</activation>
<modules>
<module>framework</module>
</modules>
</profile>
+ <profile>
+ <id>framework-default</id>
+ <activation>
+ <property>
+ <name>!framework</name>
+ </property>
+ </activation>
+ <modules>
+ <module>framework</module>
+ </modules>
+ </profile>
<!--
Name: jbossmc-javadoc
14 years, 5 months