[jboss-cvs] JBossAS SVN: r101167 - in projects/jboss-osgi/projects/bundles/jndi/trunk: .settings and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 19 09:57:29 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-19 09:57:28 -0500 (Fri, 19 Feb 2010)
New Revision: 101167
Added:
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/
Removed:
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/Constants.java
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
projects/jboss-osgi/projects/bundles/jndi/trunk/src/
Modified:
projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
Log:
split jndi into modules
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 14:56:59 UTC (rev 101166)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 14:57:28 UTC (rev 101167)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 14:56:59 UTC (rev 101166)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 14:57:28 UTC (rev 101167)
@@ -1,12 +1,6 @@
-#Wed Feb 17 12:16:11 CET 2010
+#Fri Feb 19 14:23:19 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi - JNDI API</name>
+ <description>The JBossOSGi Naming Service</description>
+
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-parent</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -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/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,62 @@
+/*
+ * 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$
+
+import javax.naming.InitialContext;
+
+import org.jboss.osgi.spi.capability.Capability;
+
+/**
+ * Adds the JNDI capability to the OSGiRuntime under test.
+ *
+ * It is ignored if the {@link InitialContext} is already registered.
+ *
+ * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr>
+ * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr>
+ * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr>
+ * </table>
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 05-May-2009
+ */
+public class JNDICapability extends Capability
+{
+ public JNDICapability()
+ {
+ super(InitialContext.class.getName());
+
+ addSystemProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost"));
+ addSystemProperty("org.jboss.osgi.jndi.rmi.port", "1198");
+ addSystemProperty("org.jboss.osgi.jndi.port", "1199");
+
+ addBundle("bundles/jboss-osgi-common-core.jar");
+ addBundle("bundles/jboss-osgi-jndi.jar");
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1 @@
+# Intentionally left empty
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml (from rev 101118, projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi - JNDI Bundle</name>
+ <description>The JBossOSGi Naming Service</description>
+
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <packaging>bundle</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-parent</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.jboss.osgi.jndi.internal.JNDIServiceActivator</Bundle-Activator>
+ <Import-Package>
+
+ <!-- system -->
+ javax.naming*,
+ javax.net,
+
+ <!-- jboss -->
+ org.jboss.logging;version="[2.1,3.0)",
+ org.jboss.net.sockets;version="[2.2,3.0)",
+ org.jboss.util.naming;version="[2.2,3.0)",
+ org.jboss.util.threadpool;version="[2.2,3.0)",
+ org.jnp.interfaces;version="[5.0,6.0)",
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.jndi;version="[1.0,2.0)",
+ org.jboss.osgi.spi*;version="[1.0,2.0)",
+
+ <!-- osgi -->
+ org.osgi.framework;version="[1.5,2.0)",
+ </Import-Package>
+ <Embed-Dependency>
+ jnpserver;inline=false,
+ jboss-osgi-jndi-api;inline=false
+ </Embed-Dependency>
+ <_exportcontents>
+ org.jnp.interfaces;version=5.0.1,
+ org.jboss.osgi.jndi;version=${version}
+ </_exportcontents>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src (from rev 101114, projects/jboss-osgi/projects/bundles/jndi/trunk/src)
Deleted: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/Constants.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/Constants.java 2010-02-18 14:18:48 UTC (rev 101114)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/Constants.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -1,40 +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;
-
-//$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
Deleted: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2010-02-18 14:18:48 UTC (rev 101114)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -1,66 +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;
-
-//$Id$
-
-import javax.naming.InitialContext;
-
-import org.jboss.osgi.common.log.LoggingCapability;
-import org.jboss.osgi.spi.capability.Capability;
-
-/**
- * Adds the JNDI capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link InitialContext} is already registered.
- *
- * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr>
- * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr>
- * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr>
- * </table>
- *
- * @author thomas.diesler at jboss.com
- * @since 05-May-2009
- */
-public class JNDICapability extends Capability
-{
- public JNDICapability()
- {
- super(InitialContext.class.getName());
-
- addSystemProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost"));
- addSystemProperty("org.jboss.osgi.jndi.rmi.port", "1198");
- addSystemProperty("org.jboss.osgi.jndi.port", "1199");
-
- addDependency(new LoggingCapability());
-
- addBundle("bundles/jboss-osgi-common-core.jar");
- addBundle("bundles/jboss-osgi-jndi.jar");
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-19 14:56:59 UTC (rev 101166)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
@@ -14,12 +14,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Bundles - JNDI</name>
+ <name>JBossOSGi - JNDI</name>
<description>The JBossOSGi Naming Service</description>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <packaging>bundle</packaging>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-parent</artifactId>
+ <packaging>pom</packaging>
<version>1.0.3-SNAPSHOT</version>
@@ -30,6 +30,19 @@
<version>1.0.5-SNAPSHOT</version>
</parent>
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/bundles/jndi/trunk</url>
+ </scm>
+
+ <!-- Modules -->
+ <modules>
+ <module>jndi-api</module>
+ <module>jndi-bundle</module>
+ </modules>
+
<!-- Properties -->
<properties>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
@@ -39,92 +52,38 @@
</properties>
<!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${version.jboss.naming}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${version.jboss.naming}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.jndi.internal.JNDIServiceActivator</Bundle-Activator>
- <Export-Package>
- org.jboss.osgi.jndi;version=${version}
- </Export-Package>
- <Import-Package>
-
- <!-- system -->
- javax.naming*,
- javax.net,
-
- <!-- jboss -->
- org.jboss.logging;version="[2.1,3.0)",
- org.jboss.net.sockets;version="[2.2,3.0)",
- org.jboss.util.naming;version="[2.2,3.0)",
- org.jboss.util.threadpool;version="[2.2,3.0)",
- org.jnp.interfaces;version="[5.0,6.0)",
-
- <!-- jboss-osgi -->
- org.jboss.osgi.common*;version="[1.0,2.0)",
- org.jboss.osgi.spi*;version="[1.0,2.0)",
-
- <!-- osgi -->
- org.osgi.framework;version="[1.5,2.0)",
-
- </Import-Package>
- <Embed-Dependency>
- jnpserver;inline=false
- </Embed-Dependency>
- <_exportcontents>
- org.jnp.interfaces;version=5.0.1
- </_exportcontents>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/bundles/jndi/trunk</url>
- </scm>
-
</project>
More information about the jboss-cvs-commits
mailing list