You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/02 08:12:40 UTC
svn commit: r1308243 - in /karaf/trunk/package:
core/src/main/java/org/apache/karaf/packages/core/
core/src/test/java/org/apache/karaf/packages/core/
management/src/main/java/org/apache/karaf/packages/management/
management/src/main/java/org/apache/kar...
Author: jbonofre
Date: Mon Apr 2 06:12:39 2012
New Revision: 1308243
URL: http://svn.apache.org/viewvc?rev=1308243&view=rev
Log:
[KARAF-1262] Checkstyle fixes
Modified:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageService.java
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java
karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/PackageRequirementTest.java
karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/PackageMBean.java
karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/internal/PackageMBeanImpl.java
Modified: karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageService.java?rev=1308243&r1=1308242&r2=1308243&view=diff
==============================================================================
--- karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageService.java (original)
+++ karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageService.java Mon Apr 2 06:12:39 2012
@@ -19,6 +19,9 @@ package org.apache.karaf.packages.core;
import java.util.SortedMap;
public interface PackageService {
+
SortedMap<String, PackageVersion> getExports();
+
SortedMap<String, PackageRequirement> getImports();
+
}
Modified: karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java?rev=1308243&r1=1308242&r2=1308243&view=diff
==============================================================================
--- karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java (original)
+++ karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java Mon Apr 2 06:12:39 2012
@@ -23,6 +23,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.Version;
public class PackageVersion {
+
private String packageName;
private Version version;
private List<Bundle> bundles = new ArrayList<Bundle>();
@@ -47,4 +48,5 @@ public class PackageVersion {
public List<Bundle> getBundles() {
return this.bundles;
}
+
}
\ No newline at end of file
Modified: karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/PackageRequirementTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/PackageRequirementTest.java?rev=1308243&r1=1308242&r2=1308243&view=diff
==============================================================================
--- karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/PackageRequirementTest.java (original)
+++ karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/PackageRequirementTest.java Mon Apr 2 06:12:39 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.karaf.packages.core;
import junit.framework.Assert;
@@ -5,10 +21,12 @@ import junit.framework.Assert;
import org.junit.Test;
public class PackageRequirementTest {
+
@Test
public void testGetPackageName() {
PackageRequirement req = new PackageRequirement("(&(osgi.wiring.package=org.osgi.service.useradmin)(version>=1.1.0))", false, null, false);
String packageName = req.getPackageName();
Assert.assertEquals("org.osgi.service.useradmin", packageName);
}
+
}
Modified: karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/PackageMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/PackageMBean.java?rev=1308243&r1=1308242&r2=1308243&view=diff
==============================================================================
--- karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/PackageMBean.java (original)
+++ karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/PackageMBean.java Mon Apr 2 06:12:39 2012
@@ -18,12 +18,10 @@ package org.apache.karaf.packages.manage
import javax.management.openmbean.TabularData;
-/**
- * Package MBean.
- */
public interface PackageMBean {
TabularData getExports() throws Exception;
+
TabularData getImports() throws Exception;
}
Modified: karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/internal/PackageMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/internal/PackageMBeanImpl.java?rev=1308243&r1=1308242&r2=1308243&view=diff
==============================================================================
--- karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/internal/PackageMBeanImpl.java (original)
+++ karaf/trunk/package/management/src/main/java/org/apache/karaf/packages/management/internal/PackageMBeanImpl.java Mon Apr 2 06:12:39 2012
@@ -37,9 +37,6 @@ import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * Bundles MBean implementation.
- */
public class PackageMBeanImpl extends StandardMBean implements PackageMBean {
private Logger log = LoggerFactory.getLogger(this.getClass());