JBoss-OSGI SVN: r89653 - in projects/jboss-osgi/trunk: bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-02 03:16:24 -0400 (Tue, 02 Jun 2009)
New Revision: 89653
Modified:
projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java
projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
Log:
Make sure the EmbeddedBeans deployer uses the correct CL
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-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-06-02 07:16:24 UTC (rev 89653)
@@ -23,6 +23,8 @@
//$Id$
+import javax.xml.parsers.SAXParserFactory;
+
import org.jboss.osgi.common.log.LogServiceTracker;
import org.jboss.osgi.spi.service.XMLBindingService;
import org.jboss.xb.binding.JBossXBException;
@@ -47,12 +49,12 @@
{
log = new LogServiceTracker(context);
- ServiceTracker saxTracker = new ServiceTracker(context, "javax.xml.parsers.SAXParserFactory", null)
+ ServiceTracker saxTracker = new ServiceTracker(context, SAXParserFactory.class.getName(), null)
{
@Override
public Object addingService(ServiceReference reference)
{
- Object saxFactory = super.addingService(reference);
+ SAXParserFactory saxFactory = (SAXParserFactory)super.addingService(reference);
log.log(LogService.LOG_DEBUG, "JBossXB SAXParserFactory: " + saxFactory);
ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
Modified: projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java 2009-06-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java 2009-06-02 07:16:24 UTC (rev 89653)
@@ -68,8 +68,10 @@
public void deploy(URL url)
{
log.log(LogService.LOG_DEBUG, "deploy: " + url);
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
try
{
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
deployer.deploy(url);
deployer.validate();
}
@@ -77,6 +79,10 @@
{
throw new IllegalStateException("Cannot deploy beans from: " + url, e);
}
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
}
/**
Modified: projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-06-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-06-02 07:16:24 UTC (rev 89653)
@@ -54,7 +54,6 @@
private EmbeddedBeansDeployer deployer;
private LogService log;
-
public MicrocontainerServiceImpl(BundleContext context)
{
this.context = context;
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-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-06-02 07:16:24 UTC (rev 89653)
@@ -94,4 +94,5 @@
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \
file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/server/minimal/bundles/jboss-osgi-apache-xerces.jar \
file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-06-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-06-02 07:16:24 UTC (rev 89653)
@@ -61,4 +61,5 @@
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \
file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/server/minimal/bundles/jboss-osgi-apache-xerces.jar \
file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar
\ No newline at end of file
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-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-02 07:16:24 UTC (rev 89653)
@@ -91,4 +91,5 @@
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \
file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/server/minimal/bundles/jboss-osgi-apache-xerces.jar \
file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar
\ No newline at end of file
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-02 06:59:10 UTC (rev 89652)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-06-02 07:16:24 UTC (rev 89653)
@@ -178,6 +178,7 @@
<!-- Server Minimal -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true">
<include name="org.apache.felix.log.jar" />
+ <include name="jboss-osgi-apache-xerces.jar" />
<include name="jboss-osgi-common.jar" />
<include name="jboss-osgi-hotdeploy.jar" />
</fileset>
@@ -215,7 +216,6 @@
<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" />
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89650 - in projects/jboss-osgi/trunk/hudson/hudson-home/jobs: JBoss-6.0.0 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-02 02:36:50 -0400 (Tue, 02 Jun 2009)
New Revision: 89650
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
Log:
Fix JBossAS startup
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-06-02 06:15:40 UTC (rev 89649)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-06-02 06:36:50 UTC (rev 89650)
@@ -34,6 +34,7 @@
HUDSONBIN=$HUDSONDIR/hudson-home/bin
JBOSS_VERSION=jboss-5.2.0.Beta
+SERVER_NAME=default
JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_VERSION.zip
@@ -50,7 +51,7 @@
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
cp $HUDSONBIN/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSONBIN/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+$HUDSONBIN/startup.sh $JBOSS_HOME $SERVER_NAME $JBOSS_BINDADDR start
#
# Was it successfully started?
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-06-02 06:15:40 UTC (rev 89649)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-06-02 06:36:50 UTC (rev 89650)
@@ -34,6 +34,7 @@
HUDSONBIN=$HUDSONDIR/hudson-home/bin
JBOSS_VERSION=jboss-6.0.0.Alpha1
+SERVER_NAME=default
JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_VERSION.zip
@@ -50,7 +51,7 @@
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
cp $HUDSONBIN/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSONBIN/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+$HUDSONBIN/startup.sh $JBOSS_HOME $SERVER_NAME $JBOSS_BINDADDR start
#
# Was it successfully started?
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89622 - in projects/jboss-osgi/trunk/runtime: knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 14:18:47 -0400 (Mon, 01 Jun 2009)
New Revision: 89622
Modified:
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
Log:
Fallback to user.home
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-06-01 18:18:27 UTC (rev 89621)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-06-01 18:18:47 UTC (rev 89622)
@@ -122,11 +122,17 @@
// Prevent a NPE when the config area is not set
if (FrameworkProperties.getProperty(PROP_INSTALL_AREA) == null)
{
- String osgiServerHome = FrameworkProperties.getProperty(OSGI_SERVER_HOME);
- if (osgiServerHome == null)
- throw new IllegalStateException("Cannot find value for property '" + PROP_INSTALL_AREA + "' nor for '" + OSGI_SERVER_HOME + "'");
-
- FrameworkProperties.setProperty(PROP_INSTALL_AREA, osgiServerHome + "/data/equinox");
+ String osgiHome = FrameworkProperties.getProperty(OSGI_SERVER_HOME);
+ if (osgiHome != null)
+ {
+ FrameworkProperties.setProperty(PROP_INSTALL_AREA, osgiHome + "/data/equinox");
+ }
+ else
+ {
+ log.warn("Cannot find value for property '" + PROP_INSTALL_AREA + "' nor for '" + OSGI_SERVER_HOME + "'");
+ String userHome = FrameworkProperties.getProperty("user.home");
+ FrameworkProperties.setProperty(PROP_INSTALL_AREA, userHome + "/equinox");
+ }
}
// Init the Framework
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-06-01 18:18:27 UTC (rev 89621)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-06-01 18:18:47 UTC (rev 89622)
@@ -136,11 +136,17 @@
// Prevent a NPE when the config area is not set
if (Framework.getProperty(ORG_OSGI_FRAMEWORK_DIR) == null)
{
- String osgiServerHome = Framework.getProperty(OSGI_SERVER_HOME);
- if (osgiServerHome == null)
- throw new IllegalStateException("Cannot find value for property '" + ORG_OSGI_FRAMEWORK_DIR + "' nor for '" + OSGI_SERVER_HOME + "'");
-
- Framework.setProperty(ORG_OSGI_FRAMEWORK_DIR, osgiServerHome + "/data/knopflerfish");
+ String osgiHome = Framework.getProperty(OSGI_SERVER_HOME);
+ if (osgiHome != null)
+ {
+ Framework.setProperty(ORG_OSGI_FRAMEWORK_DIR, osgiHome + "/data/knopflerfish");
+ }
+ else
+ {
+ log.warn("Cannot find value for property '" + ORG_OSGI_FRAMEWORK_DIR + "' nor for '" + OSGI_SERVER_HOME + "'");
+ String userHome = Framework.getProperty("user.home");
+ Framework.setProperty(ORG_OSGI_FRAMEWORK_DIR, userHome + "/knopflerfish");
+ }
}
// Cannot disable REGISTERSERVICEURLHANDLER
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89617 - projects/jboss-osgi/trunk/distribution/runtime/conf.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 13:49:55 -0400 (Mon, 01 Jun 2009)
New Revision: 89617
Modified:
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
Log:
Add missing javax.imageio, javax.imageio.stream
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 17:49:43 UTC (rev 89616)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-01 17:49:55 UTC (rev 89617)
@@ -40,6 +40,8 @@
# System Packages
org.osgi.framework.system.packages=\
+ javax.imageio, \
+ javax.imageio.stream, \
javax.management, \
javax.management.remote, \
javax.naming, \
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89615 - in projects/jboss-osgi/trunk: runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 13:39:32 -0400 (Mon, 01 Jun 2009)
New Revision: 89615
Modified:
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/Constants.java
Log:
Add equinox, knopflerfish data directory
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-06-01 17:29:43 UTC (rev 89614)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-06-01 17:39:32 UTC (rev 89615)
@@ -23,6 +23,9 @@
//$Id$
+import static org.eclipse.core.runtime.adaptor.LocationManager.PROP_INSTALL_AREA;
+import static org.jboss.osgi.spi.Constants.OSGI_SERVER_HOME;
+
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,7 +33,6 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.core.runtime.adaptor.LocationManager;
import org.eclipse.osgi.framework.internal.core.Framework;
import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
import org.jboss.logging.Logger;
@@ -118,10 +120,13 @@
}
// Prevent a NPE when the config area is not set
- if (FrameworkProperties.getProperty(LocationManager.PROP_INSTALL_AREA) == null)
+ if (FrameworkProperties.getProperty(PROP_INSTALL_AREA) == null)
{
- String userHome = FrameworkProperties.getProperty("user.home");
- FrameworkProperties.setProperty(LocationManager.PROP_INSTALL_AREA, userHome + "/equinox");
+ String osgiServerHome = FrameworkProperties.getProperty(OSGI_SERVER_HOME);
+ if (osgiServerHome == null)
+ throw new IllegalStateException("Cannot find value for property '" + PROP_INSTALL_AREA + "' nor for '" + OSGI_SERVER_HOME + "'");
+
+ FrameworkProperties.setProperty(PROP_INSTALL_AREA, osgiServerHome + "/data/equinox");
}
// Init the Framework
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-06-01 17:29:43 UTC (rev 89614)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-06-01 17:39:32 UTC (rev 89615)
@@ -23,6 +23,8 @@
//$Id$
+import static org.jboss.osgi.spi.Constants.OSGI_SERVER_HOME;
+
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.net.URL;
@@ -49,6 +51,8 @@
*/
public class KnopflerfishIntegration implements OSGiFramework
{
+ private static final String ORG_OSGI_FRAMEWORK_DIR = "org.osgi.framework.dir";
+
// Provide logging
final Logger log = Logger.getLogger(KnopflerfishIntegration.class);
@@ -130,10 +134,13 @@
}
// Prevent a NPE when the config area is not set
- if (Framework.getProperty("org.osgi.framework.dir") == null)
+ if (Framework.getProperty(ORG_OSGI_FRAMEWORK_DIR) == null)
{
- String userHome = Framework.getProperty("user.home");
- Framework.setProperty("org.osgi.framework.dir", userHome + "/knopflerfish");
+ String osgiServerHome = Framework.getProperty(OSGI_SERVER_HOME);
+ if (osgiServerHome == null)
+ throw new IllegalStateException("Cannot find value for property '" + ORG_OSGI_FRAMEWORK_DIR + "' nor for '" + OSGI_SERVER_HOME + "'");
+
+ Framework.setProperty(ORG_OSGI_FRAMEWORK_DIR, osgiServerHome + "/data/knopflerfish");
}
// Cannot disable REGISTERSERVICEURLHANDLER
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/Constants.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/Constants.java 2009-06-01 17:29:43 UTC (rev 89614)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/Constants.java 2009-06-01 17:39:32 UTC (rev 89615)
@@ -23,7 +23,6 @@
//$Id$
-
/**
* JBossOSGi Constants
*
@@ -42,4 +41,14 @@
* The default is 'true'
*/
String PROPERTY_DEFERRED_START = "org.jboss.osgi.deferred.start";
+
+ /**
+ * The JBossOSGi runtime system property that denotes the path to the runtime
+ */
+ String OSGI_HOME = "osgi.home";
+
+ /**
+ * The JBossOSGi runtime system property that denotes the path to the active server
+ */
+ String OSGI_SERVER_HOME = "osgi.server.home";
}
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89613 - projects/jboss-osgi/trunk/distribution/src/main/resources/installer.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 13:10:27 -0400 (Mon, 01 Jun 2009)
New Revision: 89613
Modified:
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
Log:
Fix missing conditions on Felix runtime
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 17:07:54 UTC (rev 89612)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-06-01 17:10:27 UTC (rev 89613)
@@ -224,11 +224,11 @@
<!-- Felix Integration -->
<singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89611 - projects/jboss-osgi/trunk/hudson/hudson-home.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 12:58:12 -0400 (Mon, 01 Jun 2009)
New Revision: 89611
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
Log:
echo startup cmd
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-06-01 16:36:23 UTC (rev 89610)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-06-01 16:58:12 UTC (rev 89611)
@@ -92,7 +92,8 @@
#
# start jbossas/runtime
#
-$HUDSONBIN/startup.sh $RUNTIME_HOME $SERVER_NAME $JBOSS_BINDADDR start
+STARTUP_CMD="$HUDSONBIN/startup.sh $RUNTIME_HOME $SERVER_NAME $JBOSS_BINDADDR start"
+echo $STARTUP_CMD; $STARTUP_CMD
#
# Was it successfully started?
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89610 - in projects/jboss-osgi/trunk: blueprint/impl/src/main/java/org/jboss/osgi/blueprint/context and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 12:36:23 -0400 (Mon, 01 Jun 2009)
New Revision: 89610
Modified:
projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/context/BlueprintContextImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/BlueprintContext.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ComponentDefinitionException.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/EventConstants.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/NoSuchComponentException.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ServiceUnavailableException.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/ConversionService.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/Converter.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentNameAlreadyInUseException.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/DeployerServiceDelegate.java
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
Log:
Add blueprint generics
Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XMLParserActivatorExt.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -40,62 +40,47 @@
import org.osgi.framework.ServiceRegistration;
/**
- * This is a copy of the {@link XMLParserActivatorExt} mentioned in the CVS
- * Header above with added XInclude support.
+ * This is a copy of the {@link XMLParserActivatorExt} mentioned in the CVS Header above with added XInclude support.
*
* Using this copy is a workarround for issue
*
- * https://jira.jboss.org/jira/browse/JBOSGI-92
+ * https://jira.jboss.org/jira/browse/JBOSGI-92
*
- * A BundleActivator class that allows any JAXP compliant XML Parser to register
- * itself as an OSGi parser service.
+ * A BundleActivator class that allows any JAXP compliant XML Parser to register itself as an OSGi parser service.
*
- * Multiple JAXP compliant parsers can concurrently register by using this
- * BundleActivator class. Bundles who wish to use an XML parser can then use the
- * framework's service registry to locate available XML Parsers with the desired
- * characteristics such as validating and namespace-aware.
+ * Multiple JAXP compliant parsers can concurrently register by using this BundleActivator class. Bundles who wish to use an XML parser can then use the framework's
+ * service registry to locate available XML Parsers with the desired characteristics such as validating and namespace-aware.
*
* <p>
* The services that this bundle activator enables a bundle to provide are:
* <ul>
* <li><code>javax.xml.parsers.SAXParserFactory</code>({@link #SAXFACTORYNAME})
- * <li><code>javax.xml.parsers.DocumentBuilderFactory</code>(
- * {@link #DOMFACTORYNAME})
+ * <li><code>javax.xml.parsers.DocumentBuilderFactory</code>( {@link #DOMFACTORYNAME})
* </ul>
*
* <p>
- * The algorithm to find the implementations of the abstract parsers is derived
- * from the JAR file specifications, specifically the Services API.
+ * The algorithm to find the implementations of the abstract parsers is derived from the JAR file specifications, specifically the Services API.
* <p>
- * An XMLParserActivator assumes that it can find the class file names of the
- * factory classes in the following files:
+ * An XMLParserActivator assumes that it can find the class file names of the factory classes in the following files:
* <ul>
- * <li><code>/META-INF/services/javax.xml.parsers.SAXParserFactory</code> is
- * a file contained in a jar available to the runtime which contains the
- * implementation class name(s) of the SAXParserFactory.
- * <li><code>/META-INF/services/javax.xml.parsers.DocumentBuilderFactory</code>
- * is a file contained in a jar available to the runtime which contains the
- * implementation class name(s) of the <code>DocumentBuilderFactory</code>
+ * <li><code>/META-INF/services/javax.xml.parsers.SAXParserFactory</code> is a file contained in a jar available to the runtime which contains the implementation class
+ * name(s) of the SAXParserFactory.
+ * <li><code>/META-INF/services/javax.xml.parsers.DocumentBuilderFactory</code> is a file contained in a jar available to the runtime which contains the implementation
+ * class name(s) of the <code>DocumentBuilderFactory</code>
* </ul>
* <p>
- * If either of the files does not exist, <code>XMLParserActivator</code>
- * assumes that the parser does not support that parser type.
+ * If either of the files does not exist, <code>XMLParserActivator</code> assumes that the parser does not support that parser type.
*
* <p>
- * <code>XMLParserActivator</code> attempts to instantiate both the
- * <code>SAXParserFactory</code> and the <code>DocumentBuilderFactory</code>.
- * It registers each factory with the framework along with service properties:
+ * <code>XMLParserActivator</code> attempts to instantiate both the <code>SAXParserFactory</code> and the <code>DocumentBuilderFactory</code>. It registers each factory
+ * with the framework along with service properties:
* <ul>
- * <li>{@link #PARSER_VALIDATING}- indicates if this factory supports
- * validating parsers. It's value is a <code>Boolean</code>.
- * <li>{@link #PARSER_NAMESPACEAWARE}- indicates if this factory supports
- * namespace aware parsers It's value is a <code>Boolean</code>.
+ * <li>{@link #PARSER_VALIDATING}- indicates if this factory supports validating parsers. It's value is a <code>Boolean</code>.
+ * <li>{@link #PARSER_NAMESPACEAWARE}- indicates if this factory supports namespace aware parsers It's value is a <code>Boolean</code>.
* </ul>
* <p>
- * Individual parser implementations may have additional features, properties,
- * or attributes which could be used to select a parser with a filter. These can
- * be added by extending this class and overriding the
- * <code>setSAXProperties</code> and <code>setDOMProperties</code> methods.
+ * Individual parser implementations may have additional features, properties, or attributes which could be used to select a parser with a filter. These can be added by
+ * extending this class and overriding the <code>setSAXProperties</code> and <code>setDOMProperties</code> methods.
*/
public class XMLParserActivatorExt implements BundleActivator, ServiceFactory
{
@@ -182,9 +167,9 @@
* @return A vector of strings containing the parser class names or null if parserUrl is null
* @throws IOException if there is a problem reading the URL input stream
*/
- private Vector getParserFactoryClassNames(URL parserUrl) throws IOException
+ private Vector<String> getParserFactoryClassNames(URL parserUrl) throws IOException
{
- Vector v = new Vector(1);
+ Vector<String> v = new Vector<String>(1);
if (parserUrl != null)
{
String parserFactoryClassName = null;
@@ -229,11 +214,11 @@
* @param parserFactoryClassNames - a <code>Vector</code> of <code>String</code> objects containing the names of the parser Factory Classes
* @throws FactoryConfigurationError if thrown from <code>getFactory</code>
*/
- private void registerSAXParsers(Vector parserFactoryClassNames) throws FactoryConfigurationError
+ private void registerSAXParsers(Vector<String> parserFactoryClassNames) throws FactoryConfigurationError
{
if (parserFactoryClassNames != null)
{
- Enumeration e = parserFactoryClassNames.elements();
+ Enumeration<String> e = parserFactoryClassNames.elements();
int index = 0;
while (e.hasMoreElements())
{
@@ -243,7 +228,7 @@
// this class will operate as a service factory and give each
// service requestor it's own SaxParserFactory
SAXParserFactory factory = (SAXParserFactory)getFactory(parserFactoryClassName);
- Hashtable properties = new Hashtable(7);
+ Hashtable<String, Object> properties = new Hashtable<String, Object>(7);
// figure out the default properties of the parser
setDefaultSAXProperties(factory, properties, index);
// store the parser factory class name in the properties so that
@@ -266,7 +251,7 @@
* @param factory The <code>SAXParserFactory</code> object
* @param props <code>Hashtable</code> of service properties.
*/
- private void setDefaultSAXProperties(SAXParserFactory factory, Hashtable props, int index)
+ private void setDefaultSAXProperties(SAXParserFactory factory, Hashtable<String, Object> props, int index)
{
props.put(Constants.SERVICE_DESCRIPTION, SAXFACTORYDESCRIPTION);
props.put(Constants.SERVICE_PID, SAXFACTORYNAME + "." + context.getBundle().getBundleId() + "." + index);
@@ -281,7 +266,7 @@
* @param factory - the SAXParserFactory object
* @param properties - the properties object for the service
*/
- public void setSAXProperties(SAXParserFactory factory, Hashtable props)
+ public void setSAXProperties(SAXParserFactory factory, Hashtable<String, Object> props)
{
// check if this parser can be configured to validate
boolean validating = true;
@@ -295,7 +280,7 @@
{
validating = false;
}
-
+
// check if this parser can be configured to be namespaceaware
boolean namespaceaware = true;
factory.setValidating(false);
@@ -308,7 +293,7 @@
{
namespaceaware = false;
}
-
+
// check if this parser can be configured to be xinclude aware
boolean xinclude = true;
factory.setValidating(validating);
@@ -322,12 +307,12 @@
{
xinclude = false;
}
-
+
// set the factory values
factory.setValidating(validating);
factory.setNamespaceAware(namespaceaware);
factory.setXIncludeAware(xinclude);
-
+
// set the OSGi service properties
props.put(PARSER_NAMESPACEAWARE, new Boolean(namespaceaware));
props.put(PARSER_VALIDATING, new Boolean(validating));
@@ -339,11 +324,11 @@
* @param parserFactoryClassNames - a <code>Vector</code> of <code>String</code> objects containing the names of the parser Factory Classes
* @throws FactoryConfigurationError if thrown from <code>getFactory</code>
*/
- private void registerDOMParsers(Vector parserFactoryClassNames) throws FactoryConfigurationError
+ private void registerDOMParsers(Vector<String> parserFactoryClassNames) throws FactoryConfigurationError
{
if (parserFactoryClassNames != null)
{
- Enumeration e = parserFactoryClassNames.elements();
+ Enumeration<String> e = parserFactoryClassNames.elements();
int index = 0;
while (e.hasMoreElements())
{
@@ -353,7 +338,7 @@
// this class will operate as a service factory and give each
// service requestor it's own DocumentBuilderFactory
DocumentBuilderFactory factory = (DocumentBuilderFactory)getFactory(parserFactoryClassName);
- Hashtable properties = new Hashtable(7);
+ Hashtable<String, Object> properties = new Hashtable<String, Object>(7);
// figure out the default properties of the parser
setDefaultDOMProperties(factory, properties, index);
// store the parser factory class name in the properties so that
@@ -375,7 +360,7 @@
* @param factory The <code>DocumentBuilderFactory</code> object
* @param props <code>Hashtable</code> of service properties.
*/
- private void setDefaultDOMProperties(DocumentBuilderFactory factory, Hashtable props, int index)
+ private void setDefaultDOMProperties(DocumentBuilderFactory factory, Hashtable<String, Object> props, int index)
{
props.put(Constants.SERVICE_DESCRIPTION, DOMFACTORYDESCRIPTION);
props.put(Constants.SERVICE_PID, DOMFACTORYNAME + "." + context.getBundle().getBundleId() + "." + index);
@@ -390,7 +375,7 @@
* @param factory - the DocumentBuilderFactory object
* @param props - Hashtable of service properties.
*/
- public void setDOMProperties(DocumentBuilderFactory factory, Hashtable props)
+ public void setDOMProperties(DocumentBuilderFactory factory, Hashtable<String, Object> props)
{
// check if this parser can be configured to validate
boolean validating = true;
@@ -404,7 +389,7 @@
{
validating = false;
}
-
+
// check if this parser can be configured to be namespaceaware
boolean namespaceaware = true;
factory.setValidating(false);
@@ -417,7 +402,7 @@
{
namespaceaware = false;
}
-
+
// check if this parser can be configured to be xinclude aware
boolean xinclude = true;
factory.setValidating(validating);
@@ -431,12 +416,12 @@
{
xinclude = false;
}
-
+
// set the factory values
factory.setValidating(validating);
factory.setNamespaceAware(namespaceaware);
factory.setXIncludeAware(xinclude);
-
+
// set the OSGi service properties
props.put(PARSER_VALIDATING, new Boolean(validating));
props.put(PARSER_NAMESPACEAWARE, new Boolean(namespaceaware));
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/context/BlueprintContextImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/context/BlueprintContextImpl.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/context/BlueprintContextImpl.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -30,7 +30,10 @@
import org.jboss.osgi.spi.NotImplementedException;
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.context.BlueprintContext;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.ServiceMetadata;
+import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata;
/**
* BlueprintContext providing access to the components, service exports, and
@@ -43,14 +46,14 @@
*/
public class BlueprintContextImpl implements BlueprintContext
{
- private Blueprint blueprintMetadata;
+ //private Blueprint blueprintMetadata;
public BlueprintContextImpl(Blueprint blueprintMetadata)
{
- this.blueprintMetadata = blueprintMetadata;
+ //this.blueprintMetadata = blueprintMetadata;
}
- public Collection getBeanComponentsMetadata()
+ public Collection<BeanMetadata> getBeanComponentsMetadata()
{
throw new NotImplementedException();
}
@@ -70,17 +73,17 @@
throw new NotImplementedException();
}
- public Set getComponentNames()
+ public Set<String> getComponentNames()
{
throw new NotImplementedException();
}
- public Collection getExportedServicesMetadata()
+ public Collection<ServiceMetadata> getExportedServicesMetadata()
{
throw new NotImplementedException();
}
- public Collection getReferencedServicesMetadata()
+ public Collection<ServiceReferenceMetadata> getReferencedServicesMetadata()
{
throw new NotImplementedException();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -32,7 +32,9 @@
import javax.xml.namespace.QName;
import org.jboss.osgi.spi.NotImplementedException;
+import org.osgi.service.blueprint.reflect.BeanArgument;
import org.osgi.service.blueprint.reflect.BeanMetadata;
+import org.osgi.service.blueprint.reflect.BeanProperty;
import org.osgi.service.blueprint.reflect.Target;
/**
@@ -287,7 +289,7 @@
// **********************************************************************
- public List getArguments()
+ public List<BeanArgument> getArguments()
{
throw new NotImplementedException();
}
@@ -297,7 +299,7 @@
throw new NotImplementedException();
}
- public List getExplicitDependencies()
+ public List<String> getExplicitDependencies()
{
throw new NotImplementedException();
}
@@ -312,12 +314,12 @@
throw new NotImplementedException();
}
- public List getProperties()
+ public List<BeanProperty> getProperties()
{
throw new NotImplementedException();
}
- public Class getRuntimeClass()
+ public Class<?> getRuntimeClass()
{
throw new NotImplementedException();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -31,6 +31,7 @@
import javax.xml.namespace.QName;
import org.jboss.osgi.spi.NotImplementedException;
+import org.osgi.service.blueprint.reflect.RegistrationListener;
import org.osgi.service.blueprint.reflect.ServiceMetadata;
import org.osgi.service.blueprint.reflect.Target;
import org.w3c.dom.Element;
@@ -337,12 +338,12 @@
throw new NotImplementedException();
}
- public List getExplicitDependencies()
+ public List<String> getExplicitDependencies()
{
throw new NotImplementedException();
}
- public Collection getRegistrationListeners()
+ public Collection<RegistrationListener> getRegistrationListeners()
{
throw new NotImplementedException();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/BlueprintContext.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/BlueprintContext.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/BlueprintContext.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -19,7 +19,10 @@
import java.util.Set;
import org.osgi.framework.BundleContext;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.ServiceMetadata;
+import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata;
/**
* BlueprintContext providing access to the components, service exports, and
@@ -64,7 +67,7 @@
* @return an immutable set (of Strings) containing the names of all of the components within the
* context.
*/
- Set getComponentNames();
+ Set<String> getComponentNames();
/**
* Get the component instance for a given named component. If the component has
@@ -114,7 +117,7 @@
*
* @return an immutable collection of ServiceComponentMetadata, with one entry for each referenced service.
*/
- Collection /*<ServiceReferenceMetadata>*/ getReferencedServicesMetadata();
+ Collection<ServiceReferenceMetadata> getReferencedServicesMetadata();
/**
* Get the service export metadata for every service exported by this
@@ -122,14 +125,14 @@
*
* @return an immutable collection of ServiceMetadata, with one entry for each service export.
*/
- Collection /*<ServiceMetadata>*/ getExportedServicesMetadata();
+ Collection<ServiceMetadata> getExportedServicesMetadata();
/**
* Get the metadata for all components defined locally within this context.
*
* @return an immutable collection of BeanMetadata, with one entry for each component.
*/
- Collection /*<BeanMetadata>*/ getBeanComponentsMetadata();
+ Collection<BeanMetadata> getBeanComponentsMetadata();
/**
* Get the bundle context of the bundle this blueprint context is associated
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ComponentDefinitionException.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ComponentDefinitionException.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ComponentDefinitionException.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,13 +16,15 @@
package org.osgi.service.blueprint.context;
/**
- * Exception thrown when a configuration-related error occurs during
- * creation of a module context.
+ * Exception thrown when a configuration-related error occurs during creation of a module context.
*/
-public class ComponentDefinitionException extends RuntimeException {
+public class ComponentDefinitionException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
- public ComponentDefinitionException(String explanation) {
- super(explanation);
- }
-
+ public ComponentDefinitionException(String explanation)
+ {
+ super(explanation);
+ }
+
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/EventConstants.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/EventConstants.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/EventConstants.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,7 +16,6 @@
package org.osgi.service.blueprint.context;
import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
/**
* Event property names used in EventAdmin events published for a
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/NoSuchComponentException.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/NoSuchComponentException.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/NoSuchComponentException.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,24 +16,26 @@
package org.osgi.service.blueprint.context;
/**
- * Thrown when an attempt is made to lookup a component by name and no such named
- * component exists in the module context.
+ * Thrown when an attempt is made to lookup a component by name and no such named component exists in the module context.
*/
-public class NoSuchComponentException extends RuntimeException {
+public class NoSuchComponentException extends RuntimeException
+{
+ private static final long serialVersionUID = 8380280560429930729L;
+
+ private final String componentName;
- private final String componentName;
-
- public NoSuchComponentException(String componentName) {
- this.componentName = componentName;
- }
-
- public String getComponentName() {
- return this.componentName;
- }
+ public NoSuchComponentException(String componentName)
+ {
+ this.componentName = componentName;
+ }
- public String getMessage() {
- return "No component named '" +
- (this.componentName == null ? "<null>" : this.componentName) +
- "' could be found";
- }
+ public String getComponentName()
+ {
+ return this.componentName;
+ }
+
+ public String getMessage()
+ {
+ return "No component named '" + (this.componentName == null ? "<null>" : this.componentName) + "' could be found";
+ }
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ServiceUnavailableException.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ServiceUnavailableException.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/context/ServiceUnavailableException.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,37 +16,35 @@
package org.osgi.service.blueprint.context;
/**
- * Thrown when an invocation is made on an OSGi service reference component, and
- * a backing service is not available.
+ * Thrown when an invocation is made on an OSGi service reference component, and a backing service is not available.
*/
-public class ServiceUnavailableException extends RuntimeException {
+public class ServiceUnavailableException extends RuntimeException
+{
+ private static final long serialVersionUID = -994241378447777904L;
+
+ private final Class<?> serviceType;
+ private final String filter;
- private final Class serviceType;
- private final String filter;
-
- public ServiceUnavailableException(
- String message,
- Class serviceType,
- String filterExpression) {
- super(message);
- this.serviceType = serviceType;
- this.filter = filterExpression;
- }
-
- /**
- * The type of the service that would have needed to be available in
- * order for the invocation to proceed.
- */
- public Class getServiceType() {
- return this.serviceType;
- }
-
- /**
- * The filter expression that a service would have needed to satisfy in order
- * for the invocation to proceed.
- */
- public String getFilter() {
- return this.filter;
- }
-}
+ public ServiceUnavailableException(String message, Class<?> serviceType, String filterExpression)
+ {
+ super(message);
+ this.serviceType = serviceType;
+ this.filter = filterExpression;
+ }
+ /**
+ * The type of the service that would have needed to be available in order for the invocation to proceed.
+ */
+ public Class<?> getServiceType()
+ {
+ return this.serviceType;
+ }
+
+ /**
+ * The filter expression that a service would have needed to satisfy in order for the invocation to proceed.
+ */
+ public String getFilter()
+ {
+ return this.filter;
+ }
+}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/ConversionService.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/ConversionService.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/ConversionService.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,21 +16,20 @@
package org.osgi.service.blueprint.convert;
/**
- * Provides access to the type conversions (both predefined and user registered)
- * that are defined for the module context
+ * Provides access to the type conversions (both predefined and user registered) that are defined for the module context
*/
-public interface ConversionService {
-
- /**
- * Convert an object to an instance of the given class, using the built-in and
- * user-registered type converters as necessary.
- * @param fromValue the object to be converted
- * @param toType the type that the instance is to be converted to
- * @return an instance of the class 'toType'
- * @throws Exception if the conversion cannot succeed. This exception is
- * checked because callers should expect that not all source objects
- * can be successfully converted.
- */
- Object convert(Object fromValue, Class toType) throws Exception;
-
+public interface ConversionService
+{
+
+ /**
+ * Convert an object to an instance of the given class, using the built-in and user-registered type converters as necessary.
+ *
+ * @param fromValue the object to be converted
+ * @param toType the type that the instance is to be converted to
+ * @return an instance of the class 'toType'
+ * @throws Exception if the conversion cannot succeed. This exception is checked because callers should expect that not all
+ * source objects can be successfully converted.
+ */
+ Object convert(Object fromValue, Class<?> toType) throws Exception;
+
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/Converter.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/Converter.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/convert/Converter.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,24 +16,25 @@
package org.osgi.service.blueprint.convert;
/**
- * Implemented by type converters that extend the type conversion
- * capabilties of a module context container.
+ * Implemented by type converters that extend the type conversion capabilties of a module context container.
*/
-public interface Converter {
-
- /**
- * The type that this converter converts String values into.
- * @return Class object for the class that this converter converts to
- */
- Class getTargetClass();
+public interface Converter
+{
- /**
- * Convert an object to an instance of the target class.
- * @param source the object to be converted
- * @return an instance of the class returned by getTargetClass
- * @throws Exception if the conversion cannot succeed. This exception is
- * checked because callers should expect that not all source objects
- * can be successfully converted.
- */
- Object convert(Object source) throws Exception;
+ /**
+ * The type that this converter converts String values into.
+ *
+ * @return Class object for the class that this converter converts to
+ */
+ Class<?> getTargetClass();
+
+ /**
+ * Convert an object to an instance of the target class.
+ *
+ * @param source the object to be converted
+ * @return an instance of the class returned by getTargetClass
+ * @throws Exception if the conversion cannot succeed. This exception is checked because callers should expect that not all source objects can be successfully
+ * converted.
+ */
+ Object convert(Object source) throws Exception;
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -51,7 +51,7 @@
*
* @return an immutable set (of Strings) containing the names of all registered components.
*/
- Set getComponentDefinitionNames();
+ Set<String> getComponentDefinitionNames();
/**
* Register a new component definition.
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentNameAlreadyInUseException.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentNameAlreadyInUseException.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/namespace/ComponentNameAlreadyInUseException.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -16,22 +16,26 @@
package org.osgi.service.blueprint.namespace;
/**
- * Exception thrown when an attempt is made to register a component with a
- * name that is already in use by an existing component.
+ * Exception thrown when an attempt is made to register a component with a name that is already in use by an existing component.
*/
-public class ComponentNameAlreadyInUseException extends RuntimeException {
+public class ComponentNameAlreadyInUseException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ private String duplicateName;
- private String duplicateName;
-
- public ComponentNameAlreadyInUseException(String name) {
- this.duplicateName = name;
- }
-
- public String getMessage() {
- return "Name '" + this.duplicateName + "' is already in use by a registered component";
- }
-
- public String getConflictingName() {
- return this.duplicateName;
- }
+ public ComponentNameAlreadyInUseException(String name)
+ {
+ this.duplicateName = name;
+ }
+
+ public String getMessage()
+ {
+ return "Name '" + this.duplicateName + "' is already in use by a registered component";
+ }
+
+ public String getConflictingName()
+ {
+ return this.duplicateName;
+ }
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -66,7 +66,7 @@
*
* @return The metadata for the factory method or constructor. Can be empty if no arguments are specified
*/
- List/* <BeanArgument> */getArguments();
+ List<BeanArgument>getArguments();
/**
* The property injection metadata for this component.
@@ -79,7 +79,7 @@
* returned.
*
*/
- List /* <BeanProperty> */getProperties();
+ List<BeanProperty>getProperties();
/**
* Is this component to be lazily instantiated?
@@ -140,7 +140,7 @@
* @return Return the class to use in runtime or <code>null</code>.
*/
- Class /* <?> */getRuntimeClass();
+ Class<?> getRuntimeClass();
/**
* The names of any components listed in a "depends-on" attribute for this
@@ -149,5 +149,5 @@
* @return an immutable List of component names for components that we have explicitly
* declared a dependency on, or an empty set if none.
*/
- List/*<String>*/ getExplicitDependencies();
+ List<String> getExplicitDependencies();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -33,7 +33,7 @@
*
* @return The interface class that the collection must implement.
*/
- Class/*<?>*/ getCollectionClass();
+ Class<?> getCollectionClass();
/**
* The value-type specified for the array
@@ -46,5 +46,5 @@
/**
* The of Metadata objects that describe the value.
*/
- List /*<Metadata>*/ getValues();
+ List<Metadata> getValues();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -19,29 +19,28 @@
/**
* A map-based value. This represented as a collection of entries (as it is done in the schema).
- *
+ *
* A map is defined in the <code>map</code> element.
- *
+ *
*/
-public interface MapMetadata extends NonNullMetadata {
- /**
- * The key-type specified for map keys, or null if none given
- *
- * Defined in the <code>key-type</code> attribute.
- * ### should we have getRuntimeKeyType?
- */
- String getKeyTypeName();
+public interface MapMetadata extends NonNullMetadata
+{
+ /**
+ * The key-type specified for map keys, or null if none given
+ *
+ * Defined in the <code>key-type</code> attribute. ### should we have getRuntimeKeyType?
+ */
+ String getKeyTypeName();
- /**
- * The value-type specified for the array
- *
- * ### should we have getRuntimeValueType?
- * The <code>value-type</code> attribute.
- */
- String getValueTypeName();
+ /**
+ * The value-type specified for the array
+ *
+ * ### should we have getRuntimeValueType? The <code>value-type</code> attribute.
+ */
+ String getValueTypeName();
- /**
- * The of Metadata objects that describe the value.
- */
- List /*<MapEntry>*/ getEntries();
+ /**
+ * The of Metadata objects that describe the value.
+ */
+ List<MapEntry> getEntries();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -37,5 +37,5 @@
*
* @return
*/
- List/*<MapEntry>*/ getEntries();
+ List<MapEntry> getEntries();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -51,7 +51,7 @@
*
* @return Class object for the specified collection type (List, Set).
*/
- Class/* <?> */getCollectionType();
+ Class<?> getCollectionType();
/**
* The comparator specified for ordering the collection, or <code>null</code> if no
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -18,7 +18,9 @@
import java.util.Collection;
import java.util.List;
+import org.jboss.osgi.blueprint.reflect.ServicePropertyEntry;
+
/**
* Metadata representing a service to be exported by a module context.
*
@@ -85,7 +87,7 @@
* @return Map containing the set of user declared service properties (may be
* empty if no properties were specified).
*/
- List/*<MapEntry>*/ getServiceProperties();
+ List<ServicePropertyEntry> getServiceProperties();
/**
* The ranking value to use when advertising the service
@@ -104,7 +106,7 @@
*
* @return an immutable collection of RegistrationListenerMetadata
*/
- Collection /*<RegistrationListener>*/ getRegistrationListeners();
+ Collection<RegistrationListener> getRegistrationListeners();
/**
* The names of any components listed in a "depends-on" attribute for this
@@ -113,5 +115,5 @@
* @return an immutable List of component names for components that we have explicitly
* declared a dependency on, or an empty set if none.
*/
- List/*<String>*/ getExplicitDependencies();
+ List<String> getExplicitDependencies();
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -52,7 +52,7 @@
*
* @return an immutable list of type names
*/
- List/*<String>*/ getInterfaceNames();
+ List<String> getInterfaceNames();
/**
* The value of the component-name attribute, if specified. This specifies
@@ -83,6 +83,6 @@
*
* @return an immutable collection of registered ListenerMetadata
*/
- Collection /*<Listener>*/ getServiceListeners();
+ Collection<Listener> getServiceListeners();
}
Modified: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/DeployerServiceDelegate.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/DeployerServiceDelegate.java 2009-06-01 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/DeployerServiceDelegate.java 2009-06-01 16:36:23 UTC (rev 89610)
@@ -25,7 +25,6 @@
import java.net.URL;
-import org.jboss.osgi.common.log.LogServiceTracker;
import org.jboss.osgi.spi.service.BundleInfo;
import org.jboss.osgi.spi.service.DeployerService;
import org.osgi.framework.BundleContext;
@@ -43,12 +42,10 @@
*/
public class DeployerServiceDelegate implements DeployerService
{
- private LogServiceTracker log;
private BundleContext context;
public DeployerServiceDelegate(BundleContext context)
{
- this.log = new LogServiceTracker(context);
this.context = context;
}
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 16:12:34 UTC (rev 89609)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-01 16:36:23 UTC (rev 89610)
@@ -38,8 +38,8 @@
org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
org.jboss.osgi.husky.runtime.connector.port=5401
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
+# System Packages
+org.osgi.framework.system.packages=\
javax.management, \
javax.management.remote, \
javax.naming, \
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89609 - in projects/jboss-osgi/trunk: husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 12:12:34 -0400 (Mon, 01 Jun 2009)
New Revision: 89609
Modified:
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractBridge.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractPackageListener.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/JMXInvocation.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LocalInvocation.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SocketInvocation.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitFailure.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitResponse.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnectorMBean.java
projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/AuditService.java
Log:
Add javadoc
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractBridge.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractBridge.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractBridge.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -37,7 +37,7 @@
import org.jboss.osgi.husky.Response;
/**
- * [TODO]
+ * An abstract {@link Bridge} implementation.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -37,7 +37,7 @@
import org.jboss.osgi.husky.runtime.PackageListener;
/**
- * [TODO]
+ * An abstract {@link Connector} implementation
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
@@ -68,7 +68,7 @@
}
throw new IllegalStateException("Cannot find listener to handle: " + testClass + ", we have " + listeners);
}
-
+
public InputStream process(InputStream reqStream)
{
try
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractPackageListener.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractPackageListener.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractPackageListener.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -32,7 +32,7 @@
import org.jboss.osgi.husky.runtime.Runner;
/**
- * [TODO]
+ * An abstract {@link PackageListener} implementation.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -26,7 +26,7 @@
import org.jboss.osgi.husky.Request;
/**
- * [TODO]
+ * A basic {@link Request} implementation.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -31,7 +31,7 @@
import org.jboss.osgi.husky.Response;
/**
- * [TODO]
+ * A basic {@link Response} implementation.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/JMXInvocation.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/JMXInvocation.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/JMXInvocation.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -38,8 +38,10 @@
import org.jboss.osgi.husky.runtime.osgi.JMXConnector;
/**
- * [TODO]
+ * A JMX based invocation.
*
+ * This is mainly used for local framework testing.
+ *
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
*/
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LocalInvocation.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LocalInvocation.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LocalInvocation.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -31,7 +31,7 @@
import org.jboss.osgi.husky.runtime.junit.JUnitRunner;
/**
- * [TODO]
+ * An 'in-memory' invocation.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -35,8 +35,14 @@
import org.jboss.osgi.husky.runtime.osgi.JMXConnector;
/**
- * [TODO]
+ * An {@link Invoker} suitable for OSGi bundle testing.
*
+ * It delegates the invocation to
+ *
+ * #1 {@link SocketInvocation}
+ * #2 {@link JMXInvocation}
+ * #3 {@link LocalInvocation}
+ *
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
*/
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SocketInvocation.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SocketInvocation.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SocketInvocation.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -33,11 +33,13 @@
import org.jboss.osgi.husky.Request;
import org.jboss.osgi.husky.Response;
-import org.jboss.osgi.husky.runtime.Connector;
+import org.jboss.osgi.husky.runtime.osgi.SocketConnector;
/**
- * [TODO]
+ * A Socket invocation.
*
+ * This is mainly used for remote framework testing.
+ *
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
*/
@@ -50,31 +52,29 @@
private static String getPort()
{
- String propNamePort = Connector.class.getName().toLowerCase() + ".port";
- String port = System.getProperty(propNamePort);
+ String port = System.getProperty(SocketConnector.PROP_SOCKET_CONNECTOR_PORT);
return port;
}
private static String getHost()
{
- String propNameHost = Connector.class.getName().toLowerCase() + ".host";
- String host = System.getProperty(propNameHost);
+ String host = System.getProperty(SocketConnector.PROP_SOCKET_CONNECTOR_HOST);
return host;
}
-
+
public Response invoke(Request req) throws Exception
{
Socket socket = new Socket(InetAddress.getByName(getHost()), new Integer(getPort()));
-
+
// Marshall the Request
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(req);
oos.close();
-
+
InputStream reqBytes = new ByteArrayInputStream(baos.toByteArray());
Util.copyStream(reqBytes, socket.getOutputStream());
-
+
// Unmarshall the Response
ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
Response response = (Response)ois.readObject();
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitFailure.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitFailure.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitFailure.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -27,7 +27,8 @@
import org.junit.runner.Description;
/**
- * [TODO]
+ * A {@link Failure} implementation that can be constructed
+ * from a JUnit4 Failure.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitResponse.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitResponse.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/junit/JUnitResponse.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -23,11 +23,13 @@
// $Id$
+import org.jboss.osgi.husky.Response;
import org.jboss.osgi.husky.internal.BasicResponse;
import org.junit.runner.Result;
/**
- * [TODO]
+ * A {@link Response} implementation that can be constructed
+ * from a JUnit4 Result.
*
* @author Thomas.Diesler(a)jboss.com
* @since 16-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -25,10 +25,21 @@
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleListener;
/**
- * [TODO]
+ * This is the Husky {@link BundleActivator}.
*
+ * It unconditionally starts the {@link JMXConnector}.
+ *
+ * If the {@link SocketConnector#PROP_SOCKET_CONNECTOR_HOST} and
+ * {@link SocketConnector#PROP_SOCKET_CONNECTOR_PORT} properites are set it also
+ * starts the {@link SocketConnector}.
+ *
+ * Finally it starts the {@link HuskyExtender}, which is a {@link BundleListener}
+ * that looks for manifest headers called {@link HuskyExtender#HEADER_TEST_PACKAGE}.
+ *
+ *
* @author Thomas.Diesler(a)jboss.com
* @since 17-May-2009
*/
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyExtender.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -35,13 +35,17 @@
import org.osgi.service.log.LogService;
/**
- * [TODO]
+ * The Husky extender is a {@link BundleListener} that checkes
+ * the {@link #HEADER_TEST_PACKAGE}
*
* @author Thomas.Diesler(a)jboss.com
* @since 17-May-2009
*/
public class HuskyExtender implements BundleListener
{
+ /** The manifest header that identifies a bundle as Husky test bundle: 'Test-Package' */
+ public static final String HEADER_TEST_PACKAGE = "Test-Package";
+
private BundleContext context;
private LogService log;
@@ -56,11 +60,12 @@
if (event.getType() == BundleEvent.STARTED)
{
Bundle bundle = event.getBundle();
- String testPackage = (String)bundle.getHeaders().get("Test-Package");
+ String testPackage = (String)bundle.getHeaders().get(HEADER_TEST_PACKAGE);
if (testPackage != null)
{
log.log(LogService.LOG_INFO, "Test-Package [" + testPackage + "] in bundle: " + bundle);
- registerPackageListener(bundle, testPackage.split("[, ]"));
+ String[] packages = testPackage.split("[,\\s]");
+ registerPackageListener(bundle, packages);
}
}
}
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -38,7 +38,8 @@
import org.osgi.service.log.LogService;
/**
- * [TODO]
+ * The JMX connector is a {@link Connector} that process Husky
+ * requests via an JMX invocation.
*
* @author Thomas.Diesler(a)jboss.com
* @since 17-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnectorMBean.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnectorMBean.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnectorMBean.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -30,7 +30,7 @@
import org.jboss.osgi.husky.runtime.PackageListener;
/**
- * [TODO]
+ * The management interface of the {@link JMXConnector}.
*
* @author Thomas.Diesler(a)jboss.com
* @since 17-May-2009
Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -39,13 +39,23 @@
import org.osgi.service.log.LogService;
/**
- * [TODO]
+ * The socket connector is a {@link Connector} that process Husky
+ * requests via an socket invocations.
*
+ * Both, the test runner process as well as the remote target process must
+ * configure the properties {@link #PROP_SOCKET_CONNECTOR_HOST} and
+ * {@link #PROP_SOCKET_CONNECTOR_PORT}.
+ *
* @author Thomas.Diesler(a)jboss.com
* @since 17-May-2009
*/
public class SocketConnector extends AbstractConnector
{
+ /** The Husky socket connector host poperty: 'org.jboss.osgi.husky.runtime.connector.host' */
+ public static final String PROP_SOCKET_CONNECTOR_HOST = Connector.class.getName().toLowerCase() + ".host";
+ /** The Husky socket connector port poperty: 'org.jboss.osgi.husky.runtime.connector.port' */
+ public static final String PROP_SOCKET_CONNECTOR_PORT = Connector.class.getName().toLowerCase() + ".port";
+
private LogService log;
private BundleContext context;
private ServiceRegistration sreg;
@@ -64,15 +74,13 @@
private static String getPort(BundleContext context)
{
- String propNamePort = Connector.class.getName().toLowerCase() + ".port";
- String port = context.getProperty(propNamePort);
+ String port = context.getProperty(PROP_SOCKET_CONNECTOR_PORT);
return port;
}
private static String getHost(BundleContext context)
{
- String propNameHost = Connector.class.getName().toLowerCase() + ".host";
- String host = context.getProperty(propNameHost);
+ String host = context.getProperty(PROP_SOCKET_CONNECTOR_HOST);
return host;
}
@@ -102,7 +110,7 @@
listenerThread.stopListener();
}
- private class ListenerThread extends Thread
+ class ListenerThread extends Thread
{
private ServerSocket serverSocket;
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -26,8 +26,13 @@
//$Id$
/**
- * [TODO]
+ * Adds the Blueprint capability to the {@link OSGiRuntime}
+ * under test.
*
+ * It is ignored if the {@link BlueprintService} is already registered.
+ *
+ * Installed bundles: jboss-osgi-blueprint.jar
+ *
* @author thomas.diesler(a)jboss.com
* @since 05-May-2009
*/
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -30,8 +30,15 @@
import java.util.Set;
/**
- * [TODO]
+ * An abstract OSGi capability that can be installed in an
+ * {@link OSGiRuntime}.
*
+ * The capability is only installed if the service name given in the constructor
+ * is not already registered with the OSGi framework.
+ *
+ * It maintains an ordered set of dependent capabilities and bundles that
+ * must be installed to provide the functionality advertised by this capability.
+ *
* @author thomas.diesler(a)jboss.com
* @since 05-May-2009
*/
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -21,14 +21,18 @@
*/
package org.jboss.osgi.spi.testing;
+//$Id$
+
import org.osgi.service.cm.ConfigurationAdmin;
-
-//$Id$
-
/**
- * [TODO]
+ * Adds the OSGi compedium ConfigAdmin capability to the {@link OSGiRuntime}
+ * under test.
*
+ * It is ignored if the {@link ConfigurationAdmin} is already registered.
+ *
+ * Installed bundles: org.apache.felix.metatype.jar, org.apache.felix.configadmin.jar
+ *
* @author thomas.diesler(a)jboss.com
* @since 05-May-2009
*/
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/AuditService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/AuditService.java 2009-06-01 15:56:08 UTC (rev 89608)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/AuditService.java 2009-06-01 16:12:34 UTC (rev 89609)
@@ -1,7 +1,5 @@
package org.jboss.test.osgi.trailblazer;
-
-
/**
* [TODO]
*
15 years, 1 month
- 1
- 0
JBoss-OSGI SVN: r89607 - projects/jboss-osgi/trunk/hudson/hudson-home/bin.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 11:23:05 -0400 (Mon, 01 Jun 2009)
New Revision: 89607
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/bin/startup.sh
Log:
Start with explicit profile config
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/bin/startup.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/bin/startup.sh 2009-06-01 15:13:19 UTC (rev 89606)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/bin/startup.sh 2009-06-01 15:23:05 UTC (rev 89607)
@@ -25,7 +25,7 @@
start)
# This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
# It relies on bash specific features
- /bin/bash $RUNTIME_HOME/bin/run.sh -c SERVER_NAME -b $BINDADDR &
+ /bin/bash $RUNTIME_HOME/bin/run.sh -c $SERVER_NAME -b $BINDADDR &
;;
stop)
pidfile="$RUNTIME_HOME/bin/pid.txt"
15 years, 1 month
- 1
- 0