[jboss-osgi-commits] JBoss-OSGI SVN: r89735 - in projects/jboss-osgi/trunk: 3rdparty/apache-xerces and 7 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Jun 3 10:25:31 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-06-03 10:25:30 -0400 (Wed, 03 Jun 2009)
New Revision: 89735
Added:
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/Constants.java
projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/Constants.java
projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNDIServiceActivator.java
Removed:
projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java
Modified:
projects/jboss-osgi/trunk/3rdparty/apache-xerces/.classpath
projects/jboss-osgi/trunk/3rdparty/apache-xerces/.project
projects/jboss-osgi/trunk/bundles/common/.project
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
projects/jboss-osgi/trunk/bundles/jndi/pom.xml
projects/jboss-osgi/trunk/docbook/en/modules/ch070-provided-bundles.xml
projects/jboss-osgi/trunk/pom.xml
Log:
More userguide - WIP
Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/.classpath
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/apache-xerces/.classpath 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/.classpath 2009-06-03 14:25:30 UTC (rev 89735)
@@ -1,7 +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/resources"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" 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"/>
Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/.project
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/apache-xerces/.project 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/.project 2009-06-03 14:25:30 UTC (rev 89735)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>apache-xerces-bundle</name>
+ <name>jboss-osgi-apache-xerces</name>
<comment></comment>
<projects>
</projects>
@@ -17,7 +17,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: projects/jboss-osgi/trunk/bundles/common/.project
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/.project 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/bundles/common/.project 2009-06-03 14:25:30 UTC (rev 89735)
@@ -17,7 +17,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/Constants.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/Constants.java (rev 0)
+++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/Constants.java 2009-06-03 14:25:30 UTC (rev 89735)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jmx;
+
+//$Id$
+
+/**
+ * The JMX service contants
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 24-Apr-2009
+ */
+public interface Constants
+{
+ /** The property that sets the host that the RMIAdaptor binds to: org.jboss.osgi.jmx.host */
+ String REMOTE_JMX_HOST = "org.jboss.osgi.jmx.host";
+ /** The property that sets the port that the RMIAdaptor binds to: org.jboss.osgi.jmx.port */
+ String REMOTE_JMX_RMI_PORT = "org.jboss.osgi.jmx.rmi.port";
+ /** The property that sets the JNDI name the RMIAdaptor binds to: org.jboss.osgi.jmx.rmi.adaptor */
+ String REMOTE_JMX_RMI_ADAPTOR = "org.jboss.osgi.jmx.rmi.adaptor";
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2009-06-03 14:25:30 UTC (rev 89735)
@@ -23,6 +23,10 @@
//$Id$
+import static org.jboss.osgi.jmx.Constants.REMOTE_JMX_HOST;
+import static org.jboss.osgi.jmx.Constants.REMOTE_JMX_RMI_ADAPTOR;
+import static org.jboss.osgi.jmx.Constants.REMOTE_JMX_RMI_PORT;
+
import javax.management.MBeanServer;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXServiceURL;
@@ -49,10 +53,6 @@
*/
public class JMXServiceActivator implements BundleActivator
{
- public static final String REMOTE_JMX_HOST = "org.jboss.osgi.jmx.host";
- public static final String REMOTE_JMX_RMI_PORT = "org.jboss.osgi.jmx.rmi.port";
- public static final String REMOTE_JMX_RMI_ADAPTOR = "org.jboss.osgi.jmx.rmi.adaptor";
-
private JMXConnectorService jmxConnector;
private String jmxHost;
private String jmxRmiPort;
Modified: projects/jboss-osgi/trunk/bundles/jndi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-06-03 14:25:30 UTC (rev 89735)
@@ -60,7 +60,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.jndi.internal.InitialContextServiceActivator</Bundle-Activator>
+ <Bundle-Activator>org.jboss.osgi.jndi.internal.JNDIServiceActivator</Bundle-Activator>
<Import-Package>
javax.naming*,
javax.net,
Added: projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/Constants.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/Constants.java (rev 0)
+++ projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/Constants.java 2009-06-03 14:25:30 UTC (rev 89735)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jndi;
+
+//$Id$
+
+/**
+ * The JNDI service contants
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 24-Apr-2009
+ */
+public interface Constants
+{
+ /** The property that sets the naming server host: org.jboss.osgi.jndi.host */
+ String REMOTE_JNDI_HOST = "org.jboss.osgi.jndi.host";
+ /** The property that sets the naming server RMI port: org.jboss.osgi.jndi.rmi.port */
+ String REMOTE_JNDI_RMI_PORT = "org.jboss.osgi.jndi.rmi.port";
+ /** The property that sets the naming server port: org.jboss.osgi.jndi.port */
+ String REMOTE_JNDI_PORT = "org.jboss.osgi.jndi.port";
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java 2009-06-03 14:25:30 UTC (rev 89735)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jndi.internal;
-
-//$Id$
-
-import javax.naming.InitialContext;
-
-import org.jboss.osgi.common.log.LogServiceTracker;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.log.LogService;
-
-/**
- * A BundleActivator for the JNDI related services
- *
- * @author thomas.diesler at jboss.com
- * @since 24-Apr-2009
- */
-public class InitialContextServiceActivator implements BundleActivator
-{
- public static final String REMOTE_JNDI_HOST = "org.jboss.osgi.jndi.host";
- public static final String REMOTE_JNDI_RMI_PORT = "org.jboss.osgi.jndi.rmi.port";
- public static final String REMOTE_JNDI_PORT = "org.jboss.osgi.jndi.port";
-
- private ServiceRegistration registration;
- private JNPServer jnpServer;
- private LogService log;
-
- public void start(BundleContext context)
- {
- log = new LogServiceTracker(context);
-
- String jndiHost = context.getProperty(REMOTE_JNDI_HOST);
- if (jndiHost == null)
- jndiHost = "localhost";
-
- String jndiRmiPort = context.getProperty(REMOTE_JNDI_RMI_PORT);
- if (jndiRmiPort == null)
- jndiRmiPort = "1098";
-
- String jndiPort = context.getProperty(REMOTE_JNDI_PORT);
- if (jndiPort == null)
- jndiPort = "1099";
-
- jnpServer = new JNPServer(context, jndiHost, Integer.parseInt(jndiPort), Integer.parseInt(jndiRmiPort));
- jnpServer.start();
-
- InitialContextFactory serviceFactory = new InitialContextFactory(jndiHost, jndiPort);
- registration = context.registerService(InitialContext.class.getName(), serviceFactory, null);
- log.log(LogService.LOG_DEBUG, "InitialContext registered");
- }
-
- public void stop(BundleContext context)
- {
- if (registration != null)
- {
- registration.unregister();
- registration = null;
- }
-
- if (jnpServer != null)
- {
- jnpServer.stop();
- jnpServer = null;
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNDIServiceActivator.java (from rev 89712, projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java)
===================================================================
--- projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNDIServiceActivator.java (rev 0)
+++ projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNDIServiceActivator.java 2009-06-03 14:25:30 UTC (rev 89735)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jndi.internal;
+
+//$Id$
+
+import static org.jboss.osgi.jndi.Constants.REMOTE_JNDI_HOST;
+import static org.jboss.osgi.jndi.Constants.REMOTE_JNDI_PORT;
+import static org.jboss.osgi.jndi.Constants.REMOTE_JNDI_RMI_PORT;
+
+import javax.naming.InitialContext;
+
+import org.jboss.osgi.common.log.LogServiceTracker;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.LogService;
+
+/**
+ * A BundleActivator for the JNDI related services
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 24-Apr-2009
+ */
+public class JNDIServiceActivator implements BundleActivator
+{
+ private ServiceRegistration registration;
+ private JNPServer jnpServer;
+ private LogService log;
+
+ public void start(BundleContext context)
+ {
+ log = new LogServiceTracker(context);
+
+ String jndiHost = context.getProperty(REMOTE_JNDI_HOST);
+ if (jndiHost == null)
+ jndiHost = "localhost";
+
+ String jndiRmiPort = context.getProperty(REMOTE_JNDI_RMI_PORT);
+ if (jndiRmiPort == null)
+ jndiRmiPort = "1098";
+
+ String jndiPort = context.getProperty(REMOTE_JNDI_PORT);
+ if (jndiPort == null)
+ jndiPort = "1099";
+
+ jnpServer = new JNPServer(context, jndiHost, Integer.parseInt(jndiPort), Integer.parseInt(jndiRmiPort));
+ jnpServer.start();
+
+ InitialContextFactory serviceFactory = new InitialContextFactory(jndiHost, jndiPort);
+ registration = context.registerService(InitialContext.class.getName(), serviceFactory, null);
+ log.log(LogService.LOG_DEBUG, "InitialContext registered");
+ }
+
+ public void stop(BundleContext context)
+ {
+ if (registration != null)
+ {
+ registration.unregister();
+ registration = null;
+ }
+
+ if (jnpServer != null)
+ {
+ jnpServer.stop();
+ jnpServer = null;
+ }
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch070-provided-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/docbook/en/modules/ch070-provided-bundles.xml 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/docbook/en/modules/ch070-provided-bundles.xml 2009-06-03 14:25:30 UTC (rev 89735)
@@ -5,9 +5,82 @@
<title>Provided Bundles and Services</title>
- <sect1 xml:id="SecLoggingService">
- <title>Logging Bridge Service</title>
+ <sect1 xml:id="SecBundleJMX">
+ <title>JMX Service</title>
+ <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-jmx.jar</emphasis> bundle activator discoveres and registers the
+ <ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink> with the framework.
+ It also tracks the naming service and binds the RMIAdaptor into JNDI for remote JMX access</para>
+
+ <para>The JMX Service is configured with these properties.</para>
+
+ <table>
+ <tr><th>Key</th><th>Value</th><th>Description</th></tr>
+ <tr valign="top">
+ <td>org.jboss.osgi.jmx.host</td>
+ <td>localhost</td>
+ <td>The property that sets the host that the RMIAdaptor binds to</td>
+ </tr>
+ <tr valign="top">
+ <td>org.jboss.osgi.jmx.port</td>
+ <td>1098</td>
+ <td>The property that sets the port that the RMIAdaptor binds to</td>
+ </tr>
+ <tr valign="top">
+ <td>org.jboss.osgi.jmx.rmi.adaptor</td>
+ <td>jmx/invoker/RMIAdaptor</td>
+ <td>The property that sets the JNDI name the RMIAdaptor binds to</td>
+ </tr>
+ </table>
+
+ <para>Here is the complete list of services that this bundle provides</para>
+
+ <itemizedlist>
+ <listitem><emphasis role="bold">javax.management.MBeanServer</emphasis></listitem>
+ <listitem><emphasis role="bold">org.jboss.osgi.spi.management.ManagedBundleService</emphasis></listitem>
+ <listitem><emphasis role="bold">org.jboss.osgi.spi.management.ManagedFrameworkService</emphasis></listitem>
+ </itemizedlist>
+
+ </sect1>
+
+ <sect1 xml:id="SecBundleJNDI">
+ <title>JNDI Service</title>
+
+ <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-jndi.jar</emphasis> bundle activator creates and registers the
+ <ulink url="http://java.sun.com/javase/6/docs/api/javax/naming/InitialContext.html">InitialContext</ulink> with the framework.</para>
+
+ <para>The JNDI Service is configured with these properties.</para>
+
+ <table>
+ <tr><th>Key</th><th>Value</th><th>Description</th></tr>
+ <tr valign="top">
+ <td>org.jboss.osgi.jndi.host</td>
+ <td>localhost</td>
+ <td>The property that sets the naming server host</td>
+ </tr>
+ <tr valign="top">
+ <td>org.jboss.osgi.jndi.rmi.port</td>
+ <td>1098</td>
+ <td>The property that sets the naming server RMI port</td>
+ </tr>
+ <tr valign="top">
+ <td>org.jboss.osgi.jndi.port</td>
+ <td>1099</td>
+ <td>The property that sets the naming server port</td>
+ </tr>
+ </table>
+
+ <para>Here is the complete list of services that this bundle provides</para>
+
+ <itemizedlist>
+ <listitem><emphasis role="bold">javax.naming.InitialContext</emphasis></listitem>
+ </itemizedlist>
+
+ </sect1>
+
+ <sect1 xml:id="SecBundleCommon">
+ <title>Logging Service</title>
+
<para>The JBoss OSGi <emphasis role="bold">jboss-osgi-common.jar</emphasis> bundle contains a simple Logging Bridge Service to
<ulink url="http://www.jboss.org/community/docs/DOC-11280">JBoss Logging</ulink>. It registers a trivial LogListener with the
LogReaderService in case that service is registered with the Framework.</para>
@@ -26,19 +99,7 @@
<ulink url="http://www.jboss.org/community/docs/DOC-12490">setting the respective logging level</ulink>.</para>
</sect1>
- <sect1 xml:id="SecJMXService">
- <title>JMX Service</title>
-
- <para>TODO</para>
- </sect1>
-
- <sect1 xml:id="SecJNDIService">
- <title>JNDI Service</title>
-
- <para>TODO</para>
- </sect1>
-
- <sect1 xml:id="SecRemoteLogService">
+ <sect1 xml:id="SecBundleRemoteLog">
<title>Remote Log Service</title>
<para>The JBoss OSGi <emphasis role="bold">jboss-osgi-remotelog.jar</emphasis> bundle contains a client side
@@ -96,7 +157,7 @@
</programlisting>
</sect1>
- <sect1 xml:id="SecMicrocontainerService">
+ <sect1 xml:id="SecBundleMicrocontainer">
<title>Microcontainer Service</title>
<para>JBoss OSGi SPI comes with a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel.
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-06-03 13:40:03 UTC (rev 89734)
+++ projects/jboss-osgi/trunk/pom.xml 2009-06-03 14:25:30 UTC (rev 89735)
@@ -9,15 +9,12 @@
<version>1.0.0.Beta2</version>
- <url>http://www.jboss.org/community/wiki/JBossOSGi</url>
- <description>JBossOSGi</description>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
<!-- Modules -->
<modules>
<module>spi</module>
@@ -34,9 +31,7 @@
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
-
<version.args4j>2.0.12</version.args4j>
- <version.aqute.bnd>0.0.323</version.aqute.bnd>
<version.equinox>3.4.2</version.equinox>
<version.felix.bundlerepository>1.0.3</version.felix.bundlerepository>
<version.felix.configadmin>1.0.10</version.felix.configadmin>
@@ -373,75 +368,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
-
- <!-- Plugins -->
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${url}</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- <failIfNoTests>false</failIfNoTests>
- </configuration>
- </plugin>
- </plugins>
-
- <!-- PluginManagement -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
+
<!-- Repositories -->
<repositories>
<repository>
@@ -452,90 +379,8 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>aQute</id>
- <url>http://www.aQute.biz/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
- <!-- PluginRepositories -->
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <!-- Licenses -->
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt
- </url>
- </license>
- </licenses>
-
- <!-- DistributionManagement -->
- <distributionManagement>
- <!--
- Add this to your ~/.m2/settings.xml
- <servers>
- <server>
- <id>jbpm.dyndns.org</id>
- <username>yourname</username>
- <privateKey>/home/yourname/.ssh/id_rsa</privateKey>
- <passphrase>yourpass</passphrase>
- </server>
- </servers>
- -->
- <repository>
- <id>repository.jboss.org</id>
- <url>${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- <!--
- <site>
- <id>jbpm.dyndns.org</id>
- <url>scp://jbpm.dyndns.org/var/www/html/jboss-osgi
- </url>
- </site>
- -->
- </distributionManagement>
-
- <!-- Reporting -->
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <show>public</show>
- <excludePackageNames>*.internal:*.incubator:*.test</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<!-- Profiles -->
<profiles>
@@ -662,7 +507,7 @@
<configuration>
<systemProperties>
<!--
- You can copy these properties in Eclipse to debug the tests
+ You can copy these properties in Eclipse to debug example tests
-Djava.protocol.handler.pkgs=org.jboss.net.protocol|org.jboss.virtual.protocol
-Djndi.server.port=1199
More information about the jboss-osgi-commits
mailing list