[jboss-cvs] JBossAS SVN: r89600 - in projects/jboss-osgi/trunk: 3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jun 1 09:55:50 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-06-01 09:55:50 -0400 (Mon, 01 Jun 2009)
New Revision: 89600

Modified:
   projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml
   projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
   projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties
   projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
   projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
Log:
Hudson uses runtime 'all' profile

Modified: projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml	2009-06-01 13:12:59 UTC (rev 89599)
+++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml	2009-06-01 13:55:50 UTC (rev 89600)
@@ -88,6 +88,7 @@
               org.jboss.util*, 
               org.osgi.framework, 
               org.osgi.service.log,
+              org.osgi.util.tracker,
               
               <!-- ignore -->
               !com.sun.jdi*

Modified: projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java	2009-06-01 13:12:59 UTC (rev 89599)
+++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java	2009-06-01 13:55:50 UTC (rev 89600)
@@ -28,10 +28,13 @@
 
 import org.jboss.osgi.common.log.LogServiceTracker;
 import org.jboss.osgi.spi.service.XMLBindingService;
+import org.jboss.xb.binding.JBossXBException;
 import org.jboss.xb.binding.parser.sax.SaxJBossXBParser;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
+import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * A {@link BundleActivator} that initializes the JBossXB bundle 
@@ -47,29 +50,41 @@
    {
       log = new LogServiceTracker(context);
       
-      ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
-      try
+      new ServiceTracker(context, SAXParserFactory.class.getName(), null)
       {
-         Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+         @Override
+         public Object addingService(ServiceReference reference)
+         {
+            SAXParserFactory saxFactory = (SAXParserFactory)super.addingService(reference);
+            log.log(LogService.LOG_DEBUG, "JBossXB SAXParserFactory: " + saxFactory);
+            
+            ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+            try
+            {
+               Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+               try
+               {
+                  // SaxJBossXBParser initializes the SAXParserFactory in a static block
+                  // using SAXParserFactory.newInstance(), which internally uses the TCCL
+                  new SaxJBossXBParser();
+               }
+               catch (JBossXBException ex)
+               {
+                  throw new IllegalStateException("Cannot initialize SaxJBossXBParser", ex);
+               }
+               XMLBindingService service = new XMLBindingService(){};
+               context.registerService(XMLBindingService.class.getName(), service, null);
+               log.log(LogService.LOG_INFO, "XMLBindingService registered");
+            }
+            finally
+            {
+               Thread.currentThread().setContextClassLoader(ctxLoader);
+            }
+            
+            return saxFactory;
+         }
          
-         SAXParserFactory saxFactory = SAXParserFactory.newInstance();
-         log.log(LogService.LOG_DEBUG, "JBossXB SAXParserFactory: " + saxFactory);
-         
-         DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-         log.log(LogService.LOG_DEBUG, "JBossXB DocumentBuilderFactory: " + domFactory);
-         
-         // SaxJBossXBParser initializes the SAXParserFactory in a static block
-         // using SAXParserFactory.newInstance(), which internally uses the TCCL
-         new SaxJBossXBParser();
-
-         XMLBindingService service = new XMLBindingService(){};
-         context.registerService(XMLBindingService.class.getName(), service, null);
-         log.log(LogService.LOG_INFO, "XMLBindingService registered");
-      }
-      finally
-      {
-         Thread.currentThread().setContextClassLoader(ctxLoader);
-      }
+      };
    }
 
    public void stop(BundleContext context) throws Exception

Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties	2009-06-01 13:12:59 UTC (rev 89599)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties	2009-06-01 13:55:50 UTC (rev 89600)
@@ -40,6 +40,12 @@
 
 # System Packages
 org.osgi.framework.system.packages=\
+   com.wutka.dtd, \
+   javassist;version=3.9, \
+   javassist.bytecode;version=3.9, \
+   javassist.bytecode.annotation;version=3.9, \
+   javax.imageio, \
+   javax.imageio.stream, \
    javax.management, \
    javax.management.remote, \
    javax.naming, \
@@ -47,25 +53,40 @@
    javax.naming.spi, \
    javax.net, \
    javax.net.ssl, \
+   javax.xml.datatype, \
    javax.xml.namespace, \
    javax.xml.parsers, \
+   javax.xml.validation, \
    javax.xml.transform, \
+   javax.xml.transform.dom, \
    javax.xml.transform.sax, \
+   javax.xml.transform.stream, \
+   org.apache.xerces.jaxp, \
+   org.apache.xerces.xs, \
    org.w3c.dom, \
+   org.w3c.dom.bootstrap, \
+   org.w3c.dom.events, \
+   org.w3c.dom.ls, \
+   org.w3c.dom.ranges, \
+   org.w3c.dom.views, \
+   org.w3c.dom.traversal, \
    org.xml.sax, \
+   org.xml.sax.ext, \
    org.xml.sax.helpers, \
+   org.jboss.logging, \
+   org.jboss.net.protocol, \
    org.jboss.osgi.spi;version=1.0, \
    org.jboss.osgi.spi.logging;version=1.0, \
    org.jboss.osgi.spi.management;version=1.0, \
    org.jboss.osgi.spi.service;version=1.0, \
    org.jboss.osgi.spi.testing;version=1.0, \
-   org.jboss.logging, \
-   org.jboss.net.protocol, \
    org.jboss.virtual, \
    org.jboss.virtual.plugins.registry, \
    org.jboss.virtual.plugins.context.jar, \
    org.jboss.virtual.plugins.vfs.helpers, \
-   org.jboss.virtual.protocol
+   org.jboss.virtual.protocol, \
+   org.osgi.service.prefs, \
+   org.osgi.util.xml;version=1.0
 
 # Bundles that need to be installed with the Framework automatically 
 org.jboss.osgi.spi.framework.autoInstall=\

Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties	2009-06-01 13:12:59 UTC (rev 89599)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties	2009-06-01 13:55:50 UTC (rev 89600)
@@ -47,12 +47,22 @@
    javax.naming.spi, \
    javax.net, \
    javax.net.ssl, \
+   javax.xml.datatype, \
    javax.xml.namespace, \
    javax.xml.parsers, \
    javax.xml.transform, \
+   javax.xml.transform.dom, \
    javax.xml.transform.sax, \
+   javax.xml.transform.stream, \
+   javax.xml.validation, \
    org.w3c.dom, \
+   org.w3c.dom.events, \
+   org.w3c.dom.ls, \
+   org.w3c.dom.ranges, \
+   org.w3c.dom.traversal, \
+   org.w3c.dom.views, \
    org.xml.sax, \
+   org.xml.sax.ext, \
    org.xml.sax.helpers, \
    org.osgi.framework;version=1.4, \
    org.osgi.service.packageadmin;version=1.2, \

Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-06-01 13:12:59 UTC (rev 89599)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-06-01 13:55:50 UTC (rev 89600)
@@ -184,6 +184,7 @@
       
       <!-- Server Default -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/bundles" override="true">
+        <!-- default -->
         <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-jndi.jar" />
@@ -191,9 +192,11 @@
 
       <!-- Server Web -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/bundles" override="true">
+        <!-- default -->
         <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-jndi.jar" />
+        <!-- web -->        
         <include name="jboss-osgi-webconsole.jar" />
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
@@ -202,17 +205,20 @@
 
       <!-- Server All -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/bundles" override="true">
-        <include name="jboss-osgi-apache-xerces.jar" />
+        <!-- default -->
         <include name="jboss-osgi-common-core.jar" />
-        <include name="jboss-osgi-jaxb.jar" />
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-jndi.jar" />
-        <include name="jboss-osgi-microcontainer.jar" />
+        <!-- web -->        
         <include name="jboss-osgi-webconsole.jar" />
-        <include name="jboss-osgi-xml-binding.jar" />
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
         <include name="org.apache.felix.metatype.jar" />
+        <!-- all -->        
+        <include name="jboss-osgi-apache-xerces.jar" />
+        <include name="jboss-osgi-jaxb.jar" />
+        <include name="jboss-osgi-microcontainer.jar" />
+        <include name="jboss-osgi-xml-binding.jar" />
       </fileset>
       
       <!-- Felix Integration -->

Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh	2009-06-01 13:12:59 UTC (rev 89599)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh	2009-06-01 13:55:50 UTC (rev 89600)
@@ -52,7 +52,7 @@
     cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
   ;;
   'runtime')
-    SERVER_NAME=web
+    SERVER_NAME=all
 	RUNTIME_HOME=$DISTRODIR/auto-install-dest/runtime
 	RUNTIME_LOG=$RUNTIME_HOME/server/$SERVER_NAME/log/server.log
   ;;




More information about the jboss-cvs-commits mailing list