7:34 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-03-31 08:34:42 -0400 (Tue, 31 Mar 2009)
New Revision: 86530
Removed:
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java
Modified:
projects/jboss-osgi/trunk/service/webconsole/pom.xml
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
projects/jboss-osgi/trunk/service/webconsole/src/main/resources/OSGI-INF/metatype/metatype.xml
Log:
WIP: webconsole
Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-03-31 11:43:36 UTC (rev
86529)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-03-31 12:34:42 UTC (rev
86530)
@@ -55,26 +55,14 @@
<Bundle-Vendor>JBoss, a division of RedHat</Bundle-Vendor>
<Bundle-Activator>org.jboss.osgi.service.webconsole.internal.WebConsoleActivator</Bundle-Activator>
<Export-Package>
- org.apache.felix.webconsole,
+ org.apache.felix.webconsole;version=${version.felix.webconsole},
org.osgi.service.obr
</Export-Package>
<Private-Package>
!org.apache.felix.webconsole,
org.apache.felix.webconsole.*,
org.jboss.osgi.service.webconsole.internal,
- org.jboss.osgi.service.webconsole.internal.*,
-
- <!--
- File Upload functionality
- -->
-
-
-
-
- <!-- Required by FileUpload and Util -->
- org.apache.commons.io,
- org.apache.commons.io.filefilter,
- org.apache.commons.io.output
+ org.jboss.osgi.service.webconsole.internal.*
</Private-Package>
<Import-Package>
org.apache.felix.scr;
@@ -84,10 +72,13 @@
</Import-Package>
<Embed-Dependency>
<!-- Import/Export-Package parsing, OBR -->
-
-
+ org.apache.felix.bundlerepository,
<!-- Required for JSON data transfer -->
- json
+ json,
+ <!-- File Upload functionality -->
+ commons-fileupload,
+ <!-- Required by FileUpload and Util -->
+ commons-io
</Embed-Dependency>
</instructions>
</configuration>
Deleted:
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-31
11:43:36 UTC (rev 86529)
+++
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java 2009-03-31
12:34:42 UTC (rev 86530)
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.webconsole.internal.servlet;
-
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.ManagedService;
-
-
-class ConfigurationListener implements ManagedService
-{
-
- private final OsgiManager osgiManager;
-
-
- static ServiceRegistration create( OsgiManager osgiManager )
- {
- ConfigurationListener cl = new ConfigurationListener( osgiManager );
-
- 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.class.getName() );
-
- return osgiManager.getBundleContext().registerService(
ManagedService.class.getName(), cl, props );
- }
-
-
- private ConfigurationListener( OsgiManager osgiManager )
- {
- this.osgiManager = osgiManager;
- }
-
-
- public void updated( Dictionary config )
- {
- osgiManager.updateConfiguration( config );
- }
-}
\ No newline at end of file
Modified:
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
===================================================================
---
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-31
11:43:36 UTC (rev 86529)
+++
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-31
12:34:42 UTC (rev 86530)
@@ -31,6 +31,9 @@
/**
* Web Console integration
*
+ * Improve console extensibility
+ * https://issues.apache.org/jira/browse/FELIX-1013
+ *
* @author thomas.diesler(a)jboss.com
* @since 12-Mar-2009
*/
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-31
11:43:36 UTC (rev 86529)
+++
projects/jboss-osgi/trunk/service/webconsole/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-03-31
12:34:42 UTC (rev 86530)
@@ -1,13 +1,13 @@
<?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:OCD id="org.jboss.osgi.service.webconsole.internal.WebConsole"
name="%manager.name" description="%manager.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">
- <metatype:Object
ocdref="org.apache.felix.webconsole.internal.servlet.OsgiManager"/>
+ <metatype:Designate
pid="org.jboss.osgi.service.webconsole.internal.WebConsole">
+ <metatype:Object
ocdref="org.jboss.osgi.service.webconsole.internal.WebConsole"/>
</metatype:Designate>
</metatype:MetaData>