Author: cschneider
Date: Fri Sep 21 14:59:21 2012
New Revision: 1388540
URL: http://svn.apache.org/viewvc?rev=1388540&view=rev
Log:
KARAF-608 Some cleanup and fixes to warnings
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/EventAdminListener.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Dependency.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/StandardEmitterMBean.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/EventAdminListener.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/EventAdminListener.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/EventAdminListener.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/EventAdminListener.java
Fri Sep 21 14:59:21 2012
@@ -33,15 +33,15 @@ import org.osgi.util.tracker.ServiceTrac
*/
public class EventAdminListener implements FeaturesListener {
- private final ServiceTracker tracker;
+ private final ServiceTracker<EventAdmin, EventAdmin> tracker;
public EventAdminListener(BundleContext context) {
- tracker = new ServiceTracker(context, EventAdmin.class.getName(),
null);
+ tracker = new ServiceTracker<EventAdmin, EventAdmin>(context,
EventAdmin.class.getName(), null);
tracker.open();
}
public void featureEvent(FeatureEvent event) {
- EventAdmin eventAdmin = (EventAdmin) tracker.getService();
+ EventAdmin eventAdmin = tracker.getService();
if (eventAdmin == null) {
return;
}
@@ -66,7 +66,7 @@ public class EventAdminListener implemen
}
public void repositoryEvent(RepositoryEvent event) {
- EventAdmin eventAdmin = (EventAdmin) tracker.getService();
+ EventAdmin eventAdmin = tracker.getService();
if (eventAdmin == null) {
return;
}
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
Fri Sep 21 14:59:21 2012
@@ -19,22 +19,16 @@ package org.apache.karaf.features.intern
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import java.util.List;
import org.apache.karaf.features.Repository;
import org.apache.karaf.features.internal.model.Features;
import org.apache.karaf.features.internal.model.JaxbUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The repository implementation.
*/
public class RepositoryImpl implements Repository {
- private static final Logger LOGGER =
LoggerFactory.getLogger(RepositoryImpl.class);
- private int unnamedRepoId = 0;
private URI uri;
- private List<URI> repositories;
private boolean valid;
private Features features;
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
Fri Sep 21 14:59:21 2012
@@ -5,7 +5,6 @@ import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.karaf.features.Feature;
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java
Fri Sep 21 14:59:21 2012
@@ -164,7 +164,8 @@ public class Content {
return Collections.<ConfigFileInfo>unmodifiableList(getConfigfile());
}
- protected void interpolation(Properties properties) {
+ @SuppressWarnings("rawtypes")
+ protected void interpolation(Properties properties) {
for (Enumeration e = properties.propertyNames(); e.hasMoreElements();
) {
String key = (String) e.nextElement();
String val = properties.getProperty(key);
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Dependency.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Dependency.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Dependency.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Dependency.java
Fri Sep 21 14:59:21 2012
@@ -20,15 +20,11 @@
package org.apache.karaf.features.internal.model;
-import java.util.List;
-import java.util.Map;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import org.apache.karaf.features.*;
/**
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
Fri Sep 21 14:59:21 2012
@@ -334,7 +334,8 @@ public class Feature extends Content imp
return result;
}
- protected void interpolation(Properties properties) {
+ @SuppressWarnings("rawtypes")
+ protected void interpolation(Properties properties) {
for (Enumeration e = properties.propertyNames(); e.hasMoreElements();)
{
String key = (String) e.nextElement();
String val = properties.getProperty(key);
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java
Fri Sep 21 14:59:21 2012
@@ -19,7 +19,6 @@
package org.apache.karaf.features.internal.model;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
@@ -28,7 +27,6 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.karaf.features.Repository;
/**
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/package-info.java
Fri Sep 21 14:59:21 2012
@@ -19,5 +19,3 @@
@javax.xml.bind.annotation.XmlSchema(namespace =
"http://karaf.apache.org/xmlns/features/v1.2.0";, elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.karaf.features.internal.model;
-
-import org.apache.karaf.features.FeaturesNamespaces;
\ No newline at end of file
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java
Fri Sep 21 14:59:21 2012
@@ -47,7 +47,7 @@ import org.osgi.framework.ServiceRegistr
public class FeaturesService extends StandardEmitterMBean implements
MBeanRegistration, FeaturesServiceMBean {
- private ServiceRegistration registration;
+ private ServiceRegistration<FeaturesListener> registration;
private BundleContext bundleContext;
@@ -55,8 +55,6 @@ public class FeaturesService extends Sta
private volatile long sequenceNumber = 0;
- private MBeanServer server;
-
private org.apache.karaf.features.FeaturesService featuresService;
public FeaturesService() throws NotCompliantMBeanException {
@@ -65,13 +63,12 @@ public class FeaturesService extends Sta
public ObjectName preRegister(MBeanServer server, ObjectName name) throws
Exception {
objectName = name;
- this.server = server;
return name;
}
public void postRegister(Boolean registrationDone) {
- registration =
bundleContext.registerService(FeaturesListener.class.getName(),
- getFeaturesListener(), new Hashtable());
+ registration = bundleContext.registerService(FeaturesListener.class,
+ getFeaturesListener(), new Hashtable<String, String>());
}
public void preDeregister() throws Exception {
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/StandardEmitterMBean.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/StandardEmitterMBean.java?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/StandardEmitterMBean.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/StandardEmitterMBean.java
Fri Sep 21 14:59:21 2012
@@ -19,7 +19,8 @@ public class StandardEmitterMBean extend
private final NotificationBroadcasterSupport emitter;
- public StandardEmitterMBean(Class mbeanInterface) throws
NotCompliantMBeanException {
+ @SuppressWarnings("rawtypes")
+ public StandardEmitterMBean(Class mbeanInterface) throws
NotCompliantMBeanException {
super(mbeanInterface);
this.emitter = new NotificationBroadcasterSupport() {
@Override
Modified:
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1388540&r1=1388539&r2=1388540&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Fri Sep 21 14:59:21 2012
@@ -18,7 +18,13 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
-
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
+
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+http://www.osgi.org/xmlns/blueprint/v1.0.0
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+http://www.osgi.org/xmlns/blueprint-ext/v1.0.0
http://aries.apache.org/schemas/blueprint-ext/blueprint-ext.xsd
+"
+>
<ext:property-placeholder placeholder-prefix="$(" placeholder-suffix=")"/>
