[jboss-cvs] JBossAS SVN: r88151 - in projects/jboss-osgi/trunk: build/distribution/runtime/conf and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-05-04 10:07:00 -0400 (Mon, 04 May 2009)
New Revision: 88151

Added:
   projects/jboss-osgi/trunk/build/distribution/runtime/conf/jndi.properties
Modified:
   projects/jboss-osgi/trunk/build/distribution/pom.xml
   projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
   projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/bundle/jmx/pom.xml
   projects/jboss-osgi/trunk/bundle/jndi/pom.xml
Log:
Add org.jnp.interfaces to JNDI exports


Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-05-04 13:56:01 UTC (rev 88150)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-05-04 14:07:00 UTC (rev 88151)
@@ -103,6 +103,11 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jndi</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-logging</artifactId>
       <version>${version}</version>
     </dependency>

Modified: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties	2009-05-04 13:56:01 UTC (rev 88150)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties	2009-05-04 14:07:00 UTC (rev 88151)
@@ -34,6 +34,7 @@
 	file://${osgi.home}/bundles/jbossxb-bundle.jar \
 	file://${osgi.home}/bundles/jboss-osgi-common.jar \
 	file://${osgi.home}/bundles/jboss-osgi-logging.jar \
+	file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
 	file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
 	file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar
 	
\ No newline at end of file

Added: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jndi.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jndi.properties	                        (rev 0)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jndi.properties	2009-05-04 14:07:00 UTC (rev 88151)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099

Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-05-04 13:56:01 UTC (rev 88150)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-05-04 14:07:00 UTC (rev 88151)
@@ -185,6 +185,7 @@
         <include name="jboss-common-core-bundle.jar" />
         <include name="jboss-osgi-common.jar" />
         <include name="jboss-osgi-logging.jar" />
+        <include name="jboss-osgi-jndi.jar" />
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-microcontainer.jar" />
         <include name="jboss-osgi-webconsole.jar" />

Modified: projects/jboss-osgi/trunk/bundle/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/jmx/pom.xml	2009-05-04 13:56:01 UTC (rev 88150)
+++ projects/jboss-osgi/trunk/bundle/jmx/pom.xml	2009-05-04 14:07:00 UTC (rev 88151)
@@ -67,6 +67,7 @@
                javax.naming.spi, 
                org.jboss.net.sockets,
                org.jboss.osgi.common.log, 
+               org.jnp.interfaces,
                org.osgi.framework;version=1.4,
                org.osgi.service.log,
             </Import-Package>

Modified: projects/jboss-osgi/trunk/bundle/jndi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/jndi/pom.xml	2009-05-04 13:56:01 UTC (rev 88150)
+++ projects/jboss-osgi/trunk/bundle/jndi/pom.xml	2009-05-04 14:07:00 UTC (rev 88151)
@@ -56,19 +56,22 @@
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.jboss.osgi.jndi.ServiceActivator</Bundle-Activator>
             <Import-Package>
-            javax.naming*, 
-            javax.net, 
-            org.jboss.logging, 
-            org.jboss.net.sockets, 
-            org.jboss.osgi.common.log, 
-            org.jboss.util.naming, 
-            org.jboss.util.threadpool, 
-            org.osgi.framework, 
-            org.osgi.service.log,
+              javax.naming*, 
+              javax.net, 
+              org.jboss.logging, 
+              org.jboss.net.sockets, 
+              org.jboss.osgi.common.log, 
+              org.jboss.util.naming, 
+              org.jboss.util.threadpool, 
+              org.osgi.framework, 
+              org.osgi.service.log,
             </Import-Package>
             <Embed-Dependency>
               jnpserver;inline=false,
             </Embed-Dependency>
+            <_exportcontents>
+              org.jnp.interfaces,
+            </_exportcontents>
           </instructions>
         </configuration>
       </plugin>