[jboss-cvs] JBossAS SVN: r83727 - in projects/jboss-felix/trunk: modules/distribution/src/main/resources/installer and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jan 31 11:00:10 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-01-31 11:00:10 -0500 (Sat, 31 Jan 2009)
New Revision: 83727
Added:
projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.maven.ide.eclipse.prefs
projects/jboss-felix/trunk/modules/service/http/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt
projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java
projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.eclipse.jdt.core.prefs
projects/jboss-felix/trunk/modules/service/http-beans/pom.xml
projects/jboss-felix/trunk/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java
projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java
projects/jboss-felix/trunk/pom.xml
Log:
Depends on 'JNDIBasedSecurityManagement'
Modified: projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2009-01-31 16:00:10 UTC (rev 83727)
@@ -1 +1 @@
-$USER_HOME/jbpm- at product.version@
+$USER_HOME/jboss-osgi- at product.version@
Modified: projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java
===================================================================
--- projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java 2009-01-31 16:00:10 UTC (rev 83727)
@@ -66,8 +66,8 @@
try
{
Bundle bundle = bundleContext.installBundle(location);
+ log.info("Start bundle: " + bundle.getSymbolicName());
bundle.start();
- log.info("Start bundle: " + bundle.getSymbolicName());
}
catch (BundleException ex)
{
Modified: projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-01-31 16:00:10 UTC (rev 83727)
@@ -117,7 +117,7 @@
try
{
Bundle bundle = context.installBundle(location);
- log.info("Install bundle: " + bundle.getSymbolicName());
+ log.info("Installed bundle: " + bundle.getSymbolicName());
}
catch (BundleException ex)
{
Added: projects/jboss-felix/trunk/modules/service/http/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-felix/trunk/modules/service/http/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-felix/trunk/modules/service/http/.settings/org.maven.ide.eclipse.prefs 2009-01-31 16:00:10 UTC (rev 83727)
@@ -0,0 +1,8 @@
+#Sat Jan 31 16:47:17 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Modified: projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.eclipse.jdt.core.prefs 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.eclipse.jdt.core.prefs 2009-01-31 16:00:10 UTC (rev 83727)
@@ -1,5 +1,12 @@
-#Thu Jan 29 07:27:04 CET 2009
+#Sat Jan 31 16:50:01 CET 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
Added: projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-felix/trunk/modules/service/http-beans/.settings/org.maven.ide.eclipse.prefs 2009-01-31 16:00:10 UTC (rev 83727)
@@ -0,0 +1,8 @@
+#Thu Jan 29 15:18:30 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Modified: projects/jboss-felix/trunk/modules/service/http-beans/pom.xml
===================================================================
--- projects/jboss-felix/trunk/modules/service/http-beans/pom.xml 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/service/http-beans/pom.xml 2009-01-31 16:00:10 UTC (rev 83727)
@@ -45,6 +45,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
<scope>provided</scope>
Modified: projects/jboss-felix/trunk/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java
===================================================================
--- projects/jboss-felix/trunk/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java 2009-01-31 16:00:10 UTC (rev 83727)
@@ -36,6 +36,7 @@
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.client.spi.DeploymentFactory;
import org.jboss.deployers.spi.attachments.MutableAttachments;
import org.jboss.deployers.structure.spi.ClassLoaderFactory;
@@ -60,7 +61,7 @@
private MBeanServer mbeanServer;
private DeploymentFactory factory = new DeploymentFactory();
- private Map<String, AbstractDeployment> deployments = new HashMap<String, AbstractDeployment>();
+ private Map<String, Deployment> deployments = new HashMap<String, Deployment>();
public void setBundleContext(BundleContext bundleContext)
{
@@ -80,7 +81,7 @@
public void registerServlet(String alias, Servlet servlet, Dictionary<String, String> initParams)
{
- AbstractDeployment deployment = deployments.get(alias);
+ Deployment deployment = deployments.get(alias);
if (deployment != null)
throw new IllegalStateException("HttpService alias already deployed: " + alias);
@@ -123,7 +124,7 @@
public void unregister(String alias)
{
- AbstractDeployment deployment = deployments.get(alias);
+ Deployment deployment = deployments.get(alias);
if (deployment != null)
{
try
@@ -132,7 +133,7 @@
MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
RealClassLoader realClassLoader = mutableAttachments.getAttachment(RealClassLoader.class);
- if (realClassLoader instanceof BundleClassLoader)
+ if (mbeanServer != null && realClassLoader instanceof BundleClassLoader)
{
BundleClassLoader bundleCL = (BundleClassLoader)realClassLoader;
mbeanServer.unregisterMBean(bundleCL.getObjectName());
@@ -228,6 +229,7 @@
public void removeClassLoader(DeploymentUnit unit) throws Exception
{
+ classLoader = null;
}
}
}
Modified: projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java
===================================================================
--- projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java 2009-01-31 16:00:10 UTC (rev 83727)
@@ -53,7 +53,6 @@
return kernel;
}
- @SuppressWarnings("deprecation")
public Object getRegisteredBean(String beanName)
{
if (kernel == null)
Modified: projects/jboss-felix/trunk/pom.xml
===================================================================
--- projects/jboss-felix/trunk/pom.xml 2009-01-31 14:38:37 UTC (rev 83726)
+++ projects/jboss-felix/trunk/pom.xml 2009-01-31 16:00:10 UTC (rev 83727)
@@ -67,6 +67,11 @@
<version>${jboss.deployers.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
<version>${jboss.metadata.version}</version>
More information about the jboss-cvs-commits
mailing list