[jboss-cvs] JBossAS SVN: r84372 - in projects/jboss-felix/trunk: modules/distribution/scripts and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 18 06:07:49 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-02-18 06:07:49 -0500 (Wed, 18 Feb 2009)
New Revision: 84372
Added:
projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap/jmx.xml
Modified:
projects/jboss-felix/trunk/modules/distribution/scripts/antrun-jboss501-osgi.xml
projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml
projects/jboss-felix/trunk/modules/integration/felix/pom.xml
projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-felix/trunk/modules/spi/pom.xml
projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java
projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java
projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java
projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java
projects/jboss-felix/trunk/modules/testsuite/pom.xml
projects/jboss-felix/trunk/pom.xml
Log:
Minimal jboss start ok
Modified: projects/jboss-felix/trunk/modules/distribution/scripts/antrun-jboss501-osgi.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/scripts/antrun-jboss501-osgi.xml 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/distribution/scripts/antrun-jboss501-osgi.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -20,16 +20,22 @@
<property name="output.dir" value="${basedir}/target" />
<property name="source.dir" value="${basedir}/src/main/etc/jboss501" />
<property name="source.server.conf" value="${source.dir}/server/conf" />
+
<property name="jboss.source.dir" value="${jboss501.home}" />
<property name="jboss.source.bin" value="${jboss.source.dir}/bin" />
<property name="jboss.source.lib" value="${jboss.source.dir}/lib" />
<property name="jboss.source.server" value="${jboss.source.dir}/server/default" />
<property name="jboss.source.server.conf" value="${jboss.source.server}/conf" />
+ <property name="jboss.source.server.deploy" value="${jboss.source.server}/deploy" />
+ <property name="jboss.source.server.deployers" value="${jboss.source.server}/deployers" />
+
<property name="jboss.target.dir" value="${output.dir}/jboss-osgi-5.0.1.GA" />
<property name="jboss.target.bin" value="${jboss.target.dir}/bin" />
<property name="jboss.target.lib" value="${jboss.target.dir}/lib" />
<property name="jboss.target.server" value="${jboss.target.dir}/server/osgi" />
<property name="jboss.target.server.conf" value="${jboss.target.server}/conf" />
+ <property name="jboss.target.server.deploy" value="${jboss.target.server}/deploy" />
+ <property name="jboss.target.server.deployers" value="${jboss.target.server}/deployers" />
<!-- ================================================================== -->
<!-- Initialization -->
@@ -75,6 +81,8 @@
<include name="endorsed/xalan.jar"/>
<include name="endorsed/xercesImpl.jar"/>
+ <include name="concurrent.jar"/>
+ <include name="dom4j.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jboss-bootstrap.jar"/>
<include name="jboss-classloader.jar"/>
@@ -82,13 +90,18 @@
<include name="jboss-common-core.jar"/>
<include name="jboss-dependency.jar"/>
<include name="jboss-deployers*.jar"/>
+ <include name="jboss-j2se.jar"/>
+ <include name="jboss-jmx.jar"/>
<include name="jboss-kernel.jar"/>
<include name="jboss-logging*.jar"/>
<include name="jboss-managed.jar"/>
+ <include name="jboss-mbeans.jar"/>
<include name="jboss-metatype.jar"/>
<include name="jboss-mdr.jar"/>
+ <include name="jboss-profileservice-spi.jar"/>
<include name="jboss-reflect.jar"/>
<include name="jboss-system.jar"/>
+ <include name="jboss-system-jmx.jar"/>
<include name="jboss-vfs.jar"/>
<include name="jboss-xml-binding.jar"/>
<include name="log4j-boot.jar"/>
@@ -103,13 +116,29 @@
<include name="jboss-log4j.xml"/>
<include name="jboss-service.xml"/>
<include name="bootstrap/deployers.xml"/>
+ <include name="bootstrap/jmx.xml"/>
</fileset>
<fileset dir="${jboss.source.server.conf}">
<include name="bootstrap/vfs.xml"/>
<include name="bootstrap/classloader.xml"/>
+ <include name="bootstrap/profile.xml"/>
</fileset>
</copy>
+ <!-- SERVER/DEPLOYERS -->
+ <copy todir="${jboss.target.server.deployers}">
+ <fileset dir="${jboss.source.server.deployers}">
+ <include name="osgi.deployer/**"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER/DEPLOY -->
+ <copy todir="${jboss.target.server.deploy}">
+ <fileset dir="${jboss.source.server.deploy}">
+ <include name="osgi/**"/>
+ </fileset>
+ </copy>
+
</target>
<!-- ================================================================== -->
Added: projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap/jmx.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap/jmx.xml (rev 0)
+++ projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap/jmx.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!--
+ The JMX Subsystem
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader>
+ <inject bean="jmx-classloader:0.0.0" />
+ </classloader>
+
+ <classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-j2se.jar</root>
+ <root>${jboss.lib.url}jboss-jmx.jar</root>
+ <root>${jboss.lib.url}jboss-mbeans.jar</root>
+ <root>${jboss.lib.url}jboss-system-jmx.jar</root>
+ <root>${jboss.lib.url}dom4j.jar</root>
+ </classloader>
+
+ <bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
+ <alias>jboss.system:type=ServerInfo</alias>
+ </bean>
+
+ <!-- The legacy JMX kernel -->
+ <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ <property name="serverImpl"><inject bean="JBossServer" /></property>
+ <property name="serverInfo"><inject bean="ServerInfo" /></property>
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap/jmx.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -8,5 +8,7 @@
<url>bootstrap/vfs.xml</url>
<url>bootstrap/classloader.xml</url>
<url>bootstrap/deployers.xml</url>
+ <url>bootstrap/jmx.xml</url>
+ <url>bootstrap/profile.xml</url>
</bootstrap>
Modified: projects/jboss-felix/trunk/modules/integration/felix/pom.xml
===================================================================
--- projects/jboss-felix/trunk/modules/integration/felix/pom.xml 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/integration/felix/pom.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -42,11 +42,6 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
Modified: projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-02-18 11:07:49 UTC (rev 84372)
@@ -30,15 +30,12 @@
import java.util.Map;
import org.apache.felix.framework.Felix;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.FrameworkException;
import org.jboss.osgi.spi.framework.OSGiFramework;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An abstraction of an OSGi Framework
@@ -49,7 +46,7 @@
public class FelixIntegration implements OSGiFramework
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(FelixIntegration.class);
+ final Logger log = Logger.getLogger(FelixIntegration.class);
private Map<String, String> felixProperties = new HashMap<String, String>();
private List<URI> autoInstall = new ArrayList<URI>();
Modified: projects/jboss-felix/trunk/modules/spi/pom.xml
===================================================================
--- projects/jboss-felix/trunk/modules/spi/pom.xml 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/spi/pom.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -28,10 +28,6 @@
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java
===================================================================
--- projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java 2009-02-18 11:07:49 UTC (rev 84372)
@@ -27,8 +27,7 @@
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
/**
* Boostrap the Microcontainer
@@ -39,7 +38,7 @@
public class EmbeddedBeansDeployer extends BasicBootstrap
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(EmbeddedBeansDeployer.class);
+ final Logger log = Logger.getLogger(EmbeddedBeansDeployer.class);
private BasicXMLDeployer deployer;
Modified: projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java
===================================================================
--- projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java 2009-02-18 11:07:49 UTC (rev 84372)
@@ -27,9 +27,9 @@
import javax.management.MBeanServerConnection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
+
/**
* An integration test case
*
@@ -39,7 +39,7 @@
public class IntegrationTestCase extends OSGiTestCase
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(IntegrationTestCase.class);
+ final Logger log = Logger.getLogger(IntegrationTestCase.class);
IntegrationTestHelper delegate = new IntegrationTestHelper();
Modified: projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java
===================================================================
--- projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java 2009-02-18 11:07:49 UTC (rev 84372)
@@ -25,11 +25,10 @@
import java.net.MalformedURLException;
import java.net.URL;
+import org.jboss.logging.Logger;
+
import junit.framework.TestCase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* An OSGi Test Case
*
@@ -39,7 +38,7 @@
public class OSGiTestCase extends TestCase
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(OSGiTestCase.class);
+ final Logger log = Logger.getLogger(OSGiTestCase.class);
private OSGiTestHelper delegate = new OSGiTestHelper();
Modified: projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java
===================================================================
--- projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java 2009-02-18 11:07:49 UTC (rev 84372)
@@ -25,12 +25,11 @@
import java.net.MalformedURLException;
import java.net.URL;
+import org.jboss.logging.Logger;
+
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* An OSGi Test Setup
*
@@ -40,7 +39,7 @@
public class OSGiTestSetup extends TestSetup
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(OSGiTestSetup.class);
+ final Logger log = Logger.getLogger(OSGiTestSetup.class);
private OSGiTestHelper delegate = new OSGiTestHelper();
Modified: projects/jboss-felix/trunk/modules/testsuite/pom.xml
===================================================================
--- projects/jboss-felix/trunk/modules/testsuite/pom.xml 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/modules/testsuite/pom.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -55,11 +55,6 @@
<scope>test</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
Modified: projects/jboss-felix/trunk/pom.xml
===================================================================
--- projects/jboss-felix/trunk/pom.xml 2009-02-18 10:18:50 UTC (rev 84371)
+++ projects/jboss-felix/trunk/pom.xml 2009-02-18 11:07:49 UTC (rev 84372)
@@ -38,7 +38,6 @@
<jbossas.version>5.0.0.GA</jbossas.version>
<junit.version>3.8.1</junit.version>
<log4j.version>1.2.14</log4j.version>
- <slf4j.version>1.5.2</slf4j.version>
</properties>
<!-- Dependecy Management -->
@@ -110,16 +109,6 @@
<artifactId>jboss-kernel</artifactId>
<version>${jboss.microcontainer.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- Felix Dependencies -->
<dependency>
More information about the jboss-cvs-commits
mailing list