[jboss-cvs] JBossAS SVN: r85779 - in projects/jboss-osgi/trunk/service: webconsole and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 12 07:39:19 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-03-12 07:39:19 -0400 (Thu, 12 Mar 2009)
New Revision: 85779
Modified:
projects/jboss-osgi/trunk/service/logging/pom.xml
projects/jboss-osgi/trunk/service/webconsole/pom.xml
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
projects/jboss-osgi/trunk/service/webconsole/src/main/resources/OSGI-INF/metatype/metatype.xml
Log:
Fix web console config admin
Modified: projects/jboss-osgi/trunk/service/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/logging/pom.xml 2009-03-12 11:36:37 UTC (rev 85778)
+++ projects/jboss-osgi/trunk/service/logging/pom.xml 2009-03-12 11:39:19 UTC (rev 85779)
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi- Service Logging</name>
+ <name>JBossOSGi - Service Logging</name>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-service-logging</artifactId>
Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-03-12 11:36:37 UTC (rev 85778)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-03-12 11:39:19 UTC (rev 85779)
@@ -22,7 +22,7 @@
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
- <!-- see resources/OSGI-INF/metatype.xml
+ <!-- see resources/OSGI-INF/metatype.xml
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
@@ -48,12 +48,14 @@
<Bundle-Vendor>JBoss, a division of RedHat</Bundle-Vendor>
<Bundle-Activator>org.jboss.osgi.service.webconsole.internal.WebConsoleActivator</Bundle-Activator>
<Export-Package>
- org.jboss.osgi.service.webconsole
+ org.apache.felix.webconsole,
+ org.osgi.service.obr
</Export-Package>
<Private-Package>
- !org.jboss.osgi.service.webconsole,
- org.jboss.osgi.service.webconsole.*,
+ !org.apache.felix.webconsole,
org.apache.felix.webconsole.*,
+ org.jboss.osgi.service.webconsole.internal,
+ org.jboss.osgi.service.webconsole.internal.*,
<!-- File Upload functionality -->
org.apache.commons.fileupload,
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java 2009-03-12 11:36:37 UTC (rev 85778)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java 2009-03-12 11:39:19 UTC (rev 85779)
@@ -40,7 +40,7 @@
Dictionary props = new Hashtable();
props.put( Constants.SERVICE_VENDOR, "The Apache Software Foundation" );
props.put( Constants.SERVICE_DESCRIPTION, "OSGi Management Console Configuration Receiver" );
- props.put( Constants.SERVICE_PID, osgiManager.getClass().getName() );
+ props.put( Constants.SERVICE_PID, OsgiManager.class.getName() );
return osgiManager.getBundleContext().registerService( ManagedService.class.getName(), cl, props );
}
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java 2009-03-12 11:36:37 UTC (rev 85778)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java 2009-03-12 11:39:19 UTC (rev 85779)
@@ -98,6 +98,12 @@
*/
private static final String PROP_PASSWORD = "password";
+ /**
+ * The default value for the {@link #PROP_MANAGER_ROOT} configuration
+ * property (value is "/system/console").
+ */
+ private static final String DEFAULT_MANAGER_ROOT = "/system/console";
+
private static final String DEFAULT_PAGE = BundlesServlet.NAME;
private static final String DEFAULT_REALM = "OSGi Management Console";
@@ -151,7 +157,7 @@
}
catch ( Throwable t )
{
- // might be caused by CM not available
+ log.log(LogService.LOG_WARNING, "Cannot register config listener", t);
}
// get at the HttpService first, this should initialize
@@ -215,7 +221,7 @@
*/
protected String getDefaultManagerRoot()
{
- return "/system/console";
+ return DEFAULT_MANAGER_ROOT;
}
//---------- Servlet API
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/resources/OSGI-INF/metatype/metatype.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-03-12 11:36:37 UTC (rev 85778)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-03-12 11:39:19 UTC (rev 85779)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
<metatype:OCD id="org.apache.felix.webconsole.internal.servlet.OsgiManager" name="%manager.name" description="%manager.description">
- <metatype:AD id="username" type="String" default="admin" name="%username.name" description="%username.description"/>
<metatype:AD id="realm" type="String" default="OSGi Management Console" name="%realm.name" description="%realm.description"/>
<metatype:AD id="manager.root" type="String" default="/jboss-osgi" name="%manager.root.name" description="%manager.root.description"/>
<metatype:AD id="default.render" type="String" default="bundles" name="%default.render.name" description="%default.render.description"/>
+ <metatype:AD id="username" type="String" default="admin" name="%username.name" description="%username.description"/>
<metatype:AD id="password" type="String" default="admin" name="%password.name" description="%password.description"/>
</metatype:OCD>
<metatype:Designate pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
More information about the jboss-cvs-commits
mailing list