Fix issue Felix-828
The JMX Handler name attribute creates correctly the name part of the MBean objectname.
Fix issue Felix-829
The JMX Handler property and method sub-elements should use the JMX handler namespace to be compliant with the XML Schema.
Fix issue Felix-830
Simplify the custom annotation processing to avoid using id/parent attributes.
Fix issue Felix-825
Provide annotations for the JMX handler
Update pom files to use the RAT plugin (allowing to automatically check missing license)
Update pom files to use the Checkstyle plugin (check automatically code format)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@719260 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/annotations/pom.xml b/ipojo/annotations/pom.xml
index 7692721..082b34f 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/annotations/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -47,23 +48,40 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Annotations</Bundle-Name>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Annotations
- </Bundle-Description>
- <Export-Package>
- org.apache.felix.ipojo.annotations,
- org.apache.felix.ipojo.handler.temporal
- </Export-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Annotations </Bundle-Description>
+ <Export-Package> org.apache.felix.ipojo.annotations,
+ org.apache.felix.ipojo.handler.temporal,
+ org.apache.felix.ipojo.handlers.jmx
+ </Export-Package>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java b/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
new file mode 100644
index 0000000..f5d390d
--- /dev/null
+++ b/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
@@ -0,0 +1,61 @@
+/*
+ * 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.ipojo.handlers.jmx;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * JMX Handler annotation.
+ * Allows exposing the instances as a JMX MBean.
+ * Be aware that despite is it provided in the annotations jar,
+ * it refers to an external handler.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+@Target(ElementType.TYPE)
+public @interface Config {
+
+ /**
+ * Enables or Disables MOSGi usage.
+ * If MOSGi is used, MBeans are exposed with the MOSGi mechanism.
+ * Otherwise the MBean Platform Server is used.
+ * Default : false
+ */
+ boolean usesMOSGi() default false;
+
+ /**
+ * Sets the MBean object name.
+ * Default : 'package-name:facotry-name:instance-name'.
+ */
+ String objectname() default "";
+
+ /**
+ * Sets the MBean domain.
+ * Default : 'package-name'
+ */
+ String domain() default "";
+
+ /**
+ * Sets the MBean name.
+ * Default : 'instance-name'
+ */
+ String name() default "";
+
+
+}
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java b/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
new file mode 100644
index 0000000..b4aab6f
--- /dev/null
+++ b/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
@@ -0,0 +1,42 @@
+/*
+ * 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.ipojo.handlers.jmx;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * JMX Method annotation.
+ * Allows exposing methods in the MBean.
+ * This annotation must be used only if the {@link Config} annotation
+ * is used.
+ * Be aware that despite is it provided in the annotations jar,
+ * it refers to an external handler.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+@Target(ElementType.METHOD)
+public @interface Method {
+
+ /**
+ * Gets the method description.
+ * Default : no description
+ */
+ String description() default "";
+
+}
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java b/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
new file mode 100644
index 0000000..de9fb9f
--- /dev/null
+++ b/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
@@ -0,0 +1,55 @@
+/*
+ * 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.ipojo.handlers.jmx;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * JMX Property annotation.
+ * Allows exposing properties in the MBean.
+ * This annotation must be used only if the {@link Config} annotation
+ * is used.
+ * Be aware that despite is it provided in the annotations jar,
+ * it refers to an external handler.
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+@Target(ElementType.FIELD)
+public @interface Property {
+
+ /**
+ * Sets the property name.
+ */
+ String name();
+
+ /**
+ * Sets the access permission.
+ * Possible values are 'r' (default) or 'w'.
+ * 'w' implies read and write access.
+ */
+ String rights() default "r";
+
+ /**
+ * Enables notification on the current property.
+ * Notifications are disable by default.
+ */
+ boolean notification() default false;
+
+
+}
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index 7821969..82a7112 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -51,7 +52,6 @@
<version>1.6.5</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -62,39 +62,51 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Ant Task</Bundle-Name>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Ant Task
- </Bundle-Description>
- <Private-Package>
- org.apache.felix.ipojo.metadata,
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Ant Task </Bundle-Description>
+ <Private-Package> org.apache.felix.ipojo.metadata,
org.apache.felix.ipojo.manipulator,
org.apache.felix.ipojo.xml.parser,
org.apache.felix.ipojo.manipulation*,
org.objectweb.asm.util;-split-package:=merge-first,
org.objectweb.asm;-split-package:=merge-first,
org.objectweb.asm.commons;-split-package:=merge-first,
- org.apache.xerces.parsers,
- org.apache.xerces.xni*,
- org.apache.xerces.impl*,
- org.apache.xerces.util.*,
- org.apache.xerces.dom.*,
- org.apache.xerces.dom3.*
+ org.apache.xerces.parsers, org.apache.xerces.xni*,
+ org.apache.xerces.impl*, org.apache.xerces.util.*,
+ org.apache.xerces.dom.*, org.apache.xerces.dom3.*
</Private-Package>
- <Export-Package>
- org.apache.felix.ipojo.task
- </Export-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm
+ <Export-Package> org.apache.felix.ipojo.task </Export-Package>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java b/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java
index a150323..046ebc2 100644
--- a/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java
+++ b/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java
@@ -21,7 +21,6 @@
import java.io.File;
import org.apache.felix.ipojo.manipulator.Pojoization;
-import org.apache.felix.ipojo.xml.parser.SchemaResolver;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index 023ed0f..96364e8 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -55,28 +56,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>
- iPOJO Arch Felix Command
- </Bundle-Name>
- <Bundle-SymbolicName>
- ${pom.artifactId}
- </Bundle-SymbolicName>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Arch command for Felix
+ <Bundle-Name> iPOJO Arch Felix Command </Bundle-Name>
+ <Bundle-SymbolicName> ${pom.artifactId} </Bundle-SymbolicName>
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Arch command for Felix
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/architecture-handler.html
+ http://felix.apache.org/site/architecture-handler.html
</Bundle-DocURL>
- <Private-Package>
- org.apache.felix.ipojo.arch
- </Private-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Private-Package> org.apache.felix.ipojo.arch </Private-Package>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -95,7 +85,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/composite/pom.xml b/ipojo/composite/pom.xml
index 4c33c43..cf4a42f 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/composite/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -33,7 +34,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -66,48 +67,32 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Composite</Bundle-Name>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Composititon Framework
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Composititon Framework
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
+ http://felix.apache.org/site/apache-felix-ipojo.html
</Bundle-DocURL>
- <Import-Package>
- org.apache.felix.ipojo,
+ <Import-Package> org.apache.felix.ipojo,
org.apache.felix.ipojo.architecture,
- org.apache.felix.ipojo.context,
- org.apache.felix.ipojo.metadata,
- org.apache.felix.ipojo.parser,
- org.apache.felix.ipojo.util,
- org.osgi.framework
- </Import-Package>
- <Private-Package>
- org.apache.felix.ipojo.manipulation,
+ org.apache.felix.ipojo.context, org.apache.felix.ipojo.metadata,
+ org.apache.felix.ipojo.parser, org.apache.felix.ipojo.util,
+ org.osgi.framework;version=1.3 </Import-Package>
+ <Private-Package> org.apache.felix.ipojo.manipulation,
org.apache.felix.ipojo.composite.architecture,
org.apache.felix.ipojo.composite.service*,
org.apache.felix.ipojo.composite.instance,
- org.apache.felix.ipojo.composite.util,
- !org.objectweb.asm.xml*,
- org.objectweb.asm*;-split-package:=merge-first
- </Private-Package>
- <Export-Package>
- org.apache.felix.ipojo.composite;
- version="0.9.0"
+ org.apache.felix.ipojo.composite.util, !org.objectweb.asm.xml*,
+ org.objectweb.asm*;-split-package:=merge-first </Private-Package>
+ <Export-Package> org.apache.felix.ipojo.composite; version="0.9.0"
</Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm
+ <Include-Resource> META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
<IPOJO-Extension>
- composite:org.apache.felix.ipojo.composite.CompositeFactory
+ composite:org.apache.felix.ipojo.composite.CompositeFactory
</IPOJO-Extension>
- <_donotcopy>
- (CVS|.svn|.+.bak|~.+|metadata.xml)
- </_donotcopy>
+ <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
</instructions>
</configuration>
</plugin>
@@ -127,7 +112,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index 0e59f28..7a7421d 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -33,7 +34,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -61,60 +62,38 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO</Bundle-Name>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-SymbolicName>
- org.apache.felix.ipojo
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-SymbolicName> org.apache.felix.ipojo
</Bundle-SymbolicName>
- <Bundle-Description>
- iPOJO Core Framework
- </Bundle-Description>
- <Bundle-Activator>
- org.apache.felix.ipojo.Extender
+ <Bundle-Description> iPOJO Core Framework </Bundle-Description>
+ <Bundle-Activator> org.apache.felix.ipojo.Extender
</Bundle-Activator>
<Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
+ http://felix.apache.org/site/apache-felix-ipojo.html
</Bundle-DocURL>
<IPOJO-Extension>
component:org.apache.felix.ipojo.ComponentFactory,
- handler:org.apache.felix.ipojo.HandlerManagerFactory
+ handler:org.apache.felix.ipojo.HandlerManagerFactory
</IPOJO-Extension>
- <Import-Package>
- org.osgi.framework, org.osgi.service.cm,
- org.osgi.service.log
- </Import-Package>
- <Private-Package>
- org.apache.felix.ipojo.handlers.architecture,
+ <Import-Package> org.osgi.framework;version=1.3, org.osgi.service.cm,
+ org.osgi.service.log </Import-Package>
+ <Private-Package> org.apache.felix.ipojo.handlers.architecture,
org.apache.felix.ipojo.handlers.configuration,
org.apache.felix.ipojo.handlers.lifecycle.callback,
- org.apache.felix.ipojo.handlers.lifecycle.controller
+ org.apache.felix.ipojo.handlers.lifecycle.controller
</Private-Package>
- <Export-Package>
- org.apache.felix.ipojo; version="0.9.0",
- org.apache.felix.ipojo.metadata;
- version="0.9.0",
- org.apache.felix.ipojo.architecture;
- version="0.9.0",
- org.apache.felix.ipojo.parser;
- version="0.9.0",
- org.apache.felix.ipojo.util;
- version="0.9.0",
- org.apache.felix.ipojo.handlers.dependency;
- version="0.9.0",
- org.apache.felix.ipojo.handlers.providedservice;
- version="0.9.0",
- org.apache.felix.ipojo.context;
- version="0.9.0", org.osgi.service.cm,
- org.osgi.service.log
- </Export-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
- <_donotcopy>
- (CVS|.svn|.+.bak|~.+|metadata.xml)
- </_donotcopy>
+ <Export-Package> org.apache.felix.ipojo; version="0.9.0",
+ org.apache.felix.ipojo.metadata; version="0.9.0",
+ org.apache.felix.ipojo.architecture; version="0.9.0",
+ org.apache.felix.ipojo.parser; version="0.9.0",
+ org.apache.felix.ipojo.util; version="0.9.0",
+ org.apache.felix.ipojo.handlers.dependency; version="0.9.0",
+ org.apache.felix.ipojo.handlers.providedservice; version="0.9.0",
+ org.apache.felix.ipojo.context; version="0.9.0",
+ org.osgi.service.cm, org.osgi.service.log </Export-Package>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
+ <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
</instructions>
</configuration>
</plugin>
@@ -134,7 +113,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ <param>.fbprefs</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java
index ce116e9..f867942 100644
--- a/ipojo/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java
+++ b/ipojo/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java
@@ -43,7 +43,7 @@
* The internal event dispatcher.
* This dispatcher is a singleton.
*/
- private static EventDispatcher m_dispatcher;
+ private static EventDispatcher DISPATCHER;
/**
* The list of listeners.
@@ -74,7 +74,7 @@
* internal event dispatcher.
*/
public static void create(BundleContext bc) {
- m_dispatcher = new EventDispatcher(bc);
+ DISPATCHER = new EventDispatcher(bc);
}
/**
@@ -83,8 +83,8 @@
* if iPOJO is stopping.
*/
public static void dispose() {
- m_dispatcher.stop();
- m_dispatcher = null;
+ DISPATCHER.stop();
+ DISPATCHER = null;
}
@@ -94,7 +94,7 @@
* <code>null</code> if not created.
*/
public static EventDispatcher getDispatcher() {
- return m_dispatcher;
+ return DISPATCHER;
}
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
index 0f63fa8..b3da972 100644
--- a/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
+++ b/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
@@ -203,7 +203,7 @@
* @throws ConfigurationException if the instance creation failed during the configuration process.
*/
public abstract ComponentInstance createInstance(Dictionary config, IPojoContext context, HandlerManager[] handlers)
- throws ConfigurationException;
+ throws ConfigurationException;
/**
* Creates an instance.
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java
index 2f3dffc..79195b2 100644
--- a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java
+++ b/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java
@@ -37,6 +37,9 @@
*/
public class Property implements FieldInterceptor {
+ /**
+ * Object used for an unvalued property.
+ */
public static final Object NO_VALUE = new Object();
/**
diff --git a/ipojo/handler/eventadmin/pom.xml b/ipojo/handler/eventadmin/pom.xml
index 7128f9d..4d67d3e 100644
--- a/ipojo/handler/eventadmin/pom.xml
+++ b/ipojo/handler/eventadmin/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -28,7 +29,6 @@
<name>Apache Felix iPOJO Event Admin Handler</name>
<artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
<version>1.1.0-SNAPSHOT</version>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -51,7 +51,6 @@
<version>1.2.0</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -64,21 +63,16 @@
<Export-Package>org.apache.felix.ipojo.handlers.event.*;
version="0.9.0"</Export-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>
- org.apache.felix.ipojo.handler.eventadmin
+ <Bundle-SymbolicName> org.apache.felix.ipojo.handler.eventadmin
</Bundle-SymbolicName>
- <Bundle-Description>
- iPOJO Event Admin Handlers
+ <Bundle-Description> iPOJO Event Admin Handlers
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/event-admin-handlers.html
+ http://felix.apache.org/site/event-admin-handlers.html
</Bundle-DocURL>
- <Bundle-Vendor>The Apache Software
- Foundation</Bundle-Vendor>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -97,7 +91,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java b/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
index 89f0a25..72ec765 100644
--- a/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
+++ b/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
@@ -102,7 +102,7 @@
* the instance is invalid.
*/
public EventAdminPublisherMetadata(Element publisher)
- throws ConfigurationException {
+ throws ConfigurationException {
/**
* Setup required attributes
diff --git a/ipojo/handler/extender/pom.xml b/ipojo/handler/extender/pom.xml
index 751f404..46fbe9d 100644
--- a/ipojo/handler/extender/pom.xml
+++ b/ipojo/handler/extender/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -26,12 +27,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Extender Pattern Handler</name>
- <artifactId>
- org.apache.felix.ipojo.handler.extender
- </artifactId>
+ <artifactId> org.apache.felix.ipojo.handler.extender </artifactId>
<groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -46,7 +44,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -54,7 +52,6 @@
<version>1.2.0</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -63,26 +60,20 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Extender Pattern Handler
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Extender Pattern Handler
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/extender-pattern-handler.html
+ http://felix.apache.org/site/extender-pattern-handler.html
</Bundle-DocURL>
- <Private-Package>
- org.apache.felix.ipojo.handler.extender
+ <Private-Package> org.apache.felix.ipojo.handler.extender
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
<Bundle-SymbolicName>
- org.apache.felix.ipojo.handler.extender.pattern
+ org.apache.felix.ipojo.handler.extender.pattern
</Bundle-SymbolicName>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -101,7 +92,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/handler/jmx/pom.xml b/ipojo/handler/jmx/pom.xml
index f4e2df7..da1f1f0 100644
--- a/ipojo/handler/jmx/pom.xml
+++ b/ipojo/handler/jmx/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -28,7 +29,6 @@
<name>Apache Felix iPOJO JMX Handler</name>
<artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
<version>1.1.0-SNAPSHOT</version>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -51,7 +51,6 @@
<version>1.2.0</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -61,25 +60,18 @@
<version>1.4.3</version>
<configuration>
<instructions>
- <Private-Package>
- org.apache.felix.ipojo.handlers.jmx
+ <Private-Package> org.apache.felix.ipojo.handlers.jmx
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>
- org.apache.felix.ipojo.handler.jmx
+ <Bundle-SymbolicName> org.apache.felix.ipojo.handler.jmx
</Bundle-SymbolicName>
- <Bundle-Vendor>The Apache Software
- Foundation</Bundle-Vendor>
- <Bundle-Description>
- iPOJO JMX Handler
- </Bundle-Description>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description> iPOJO JMX Handler </Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/ipojo-jmx-handler.html
+ http://felix.apache.org/site/ipojo-jmx-handler.html
</Bundle-DocURL>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -106,7 +98,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/MBeanHandler.java b/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/MBeanHandler.java
index 2b22e62..d78fc47 100644
--- a/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/MBeanHandler.java
+++ b/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/MBeanHandler.java
@@ -249,7 +249,15 @@
}
// set property
- Element[] attributes = mbeans[0].getElements(JMX_PROPERTY_ELT);
+ Element[] attributes = mbeans[0].getElements(JMX_PROPERTY_ELT, m_namespace);
+
+ if (attributes == null) {
+ attributes = mbeans[0].getElements(JMX_METHOD_ELT);
+ if (attributes != null) {
+ warn("The JMX property element should use the '" + m_namespace + "' namespace.");
+ }
+ }
+
// String[] fields = new String[attributes.length];
if (attributes != null) {
for (int i = 0; attributes != null && i < attributes.length; i++) {
@@ -296,9 +304,20 @@
}
// set methods
- Element[] methods = mbeans[0].getElements(JMX_METHOD_ELT);
+ Element[] methods = mbeans[0].getElements(JMX_METHOD_ELT, m_namespace);
+
+ if (methods == null) {
+ methods = mbeans[0].getElements(JMX_METHOD_ELT);
+ if (methods != null) {
+ warn("The JMX method element should use the '" + m_namespace + "' namespace.");
+ }
+ }
+
for (int i = 0; methods != null && i < methods.length; i++) {
String name = methods[i].getAttribute(JMX_NAME_ELT);
+ if (name == null) {
+ name = methods[i].getAttribute("method");
+ }
String description = null;
if (methods[i].containsAttribute(JMX_DESCRIPTION_ELT)) {
description = methods[i].getAttribute(JMX_DESCRIPTION_ELT);
@@ -394,7 +413,7 @@
String name = "type=" + m_instanceManager.getClassName() + ",instance="
+ m_instanceManager.getInstanceName();
if (m_objNameWODomainElt != null) {
- name = m_objNameWODomainElt;
+ name = "name=" + m_objNameWODomainElt;
}
StringBuffer sb = new StringBuffer();
@@ -403,6 +422,8 @@
}
sb.append(name);
+ info("Computed Objectname: " + sb.toString());
+
return sb.toString();
}
@@ -522,19 +543,19 @@
private MethodField[] getMethodsFromName(String methodName,
PojoMetadata manipulation, String description) {
- MethodMetadata[] fields = manipulation.getMethods(methodName);
- if (fields.length == 0) {
+ MethodMetadata[] methods = manipulation.getMethods(methodName);
+ if (methods.length == 0) {
return null;
}
- MethodField[] ret = new MethodField[fields.length];
+ MethodField[] ret = new MethodField[methods.length];
- if (fields.length == 1) {
- ret[0] = new MethodField(fields[0], description);
+ if (methods.length == 1) {
+ ret[0] = new MethodField(methods[0], description);
return ret;
} else {
- for (int i = 0; i < fields.length; i++) {
- ret[i] = new MethodField(fields[i], description);
+ for (int i = 0; i < methods.length; i++) {
+ ret[i] = new MethodField(methods[i], description);
}
return ret;
}
diff --git a/ipojo/handler/temporal/pom.xml b/ipojo/handler/temporal/pom.xml
index 52c24db..3bc6726 100644
--- a/ipojo/handler/temporal/pom.xml
+++ b/ipojo/handler/temporal/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -29,12 +30,11 @@
<groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<name>Apache Felix iPOJO Temporal Service Dependency Handler</name>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -52,7 +52,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -62,26 +61,19 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Private-Package>
- org.apache.felix.ipojo.handler.temporal
+ <Private-Package> org.apache.felix.ipojo.handler.temporal
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>
- org.apache.felix.ipojo.handler.temporal
+ <Bundle-SymbolicName> org.apache.felix.ipojo.handler.temporal
</Bundle-SymbolicName>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Temporal Dependency Handler
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Temporal Dependency Handler
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/temporal-service-dependency.html
+ http://felix.apache.org/site/temporal-service-dependency.html
</Bundle-DocURL>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -100,7 +92,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/handler/whiteboard/pom.xml b/ipojo/handler/whiteboard/pom.xml
index 011cb0f..4c2f892 100644
--- a/ipojo/handler/whiteboard/pom.xml
+++ b/ipojo/handler/whiteboard/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -26,12 +27,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO White Board Pattern Handler</name>
- <artifactId>
- org.apache.felix.ipojo.handler.whiteboard
- </artifactId>
+ <artifactId> org.apache.felix.ipojo.handler.whiteboard </artifactId>
<groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -46,7 +44,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -54,7 +52,6 @@
<version>1.2.0</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -64,29 +61,21 @@
<configuration>
<instructions>
<Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>
- org.apache.felix.ipojo.handler.whiteboard
+ <Bundle-SymbolicName> org.apache.felix.ipojo.handler.whiteboard
</Bundle-SymbolicName>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO White-Board Pattern Handler
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO White-Board Pattern Handler
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/white-board-pattern-handler.html
+ http://felix.apache.org/site/white-board-pattern-handler.html
</Bundle-DocURL>
- <Private-Package>
- org.apache.felix.ipojo.handler.wbp
+ <Private-Package> org.apache.felix.ipojo.handler.wbp
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>
- ipojo.event.admin.handler.wbp
+ <Bundle-SymbolicName> ipojo.event.admin.handler.wbp
</Bundle-SymbolicName>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -105,7 +94,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index 3d5f3ed..a77ec58 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -29,7 +30,6 @@
<groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<name>Apache Felix iPOJO Manipulator</name>
-
<dependencies>
<dependency>
<groupId>asm</groupId>
@@ -58,31 +58,45 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Manipulator</Bundle-Name>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Manipulator
- </Bundle-Description>
- <Export-Package>
- org.apache.felix.ipojo.manipulator
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Manipulator </Bundle-Description>
+ <Export-Package> org.apache.felix.ipojo.manipulator
</Export-Package>
- <Private-Package>
- org.apache.felix.ipojo.manipulation,
+ <Private-Package> org.apache.felix.ipojo.manipulation,
org.apache.felix.ipojo.manipulation.annotations,
- org.apache.felix.ipojo.xml.parser,
- org.objectweb.asm, org.objectweb.asm.commons
- </Private-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/LICENCE.asm=LICENSE.asm,
- META-INF/NOTICE=NOTICE,
- xsd=src/main/resources
- </Include-Resource>
+ org.apache.felix.ipojo.xml.parser, org.objectweb.asm,
+ org.objectweb.asm.commons </Private-Package>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/LICENCE.asm=LICENSE.asm, META-INF/NOTICE=NOTICE,
+ xsd=src/main/resources </Include-Resource>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
index 9e110c4..fd852a8 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
@@ -81,7 +81,7 @@
* @param message : message to log
*/
public void log(int level, String message) {
- if (level >= m_logLevel) {
+ if (level >= LOG_LEVEL) {
switch (level) {
case INFO:
System.err.println("[INFO] " + message);
@@ -103,12 +103,12 @@
/**
* Manipulator logger.
*/
- private static Logger m_logger;
+ private static Logger LOGGER;
/**
* Default logger level.
*/
- private static int m_logLevel = WARNING;
+ private static int LOG_LEVEL = WARNING;
/**
@@ -116,9 +116,9 @@
* @return the logger used by the manipulator.
*/
public static Logger getLogger() {
- if (m_logger == null) {
- m_logger = new Logger();
+ if (LOGGER == null) {
+ LOGGER = new Logger();
}
- return m_logger;
+ return LOGGER;
}
}
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/CustomAnnotationVisitor.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/CustomAnnotationVisitor.java
index aafd81f..9410430 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/CustomAnnotationVisitor.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/CustomAnnotationVisitor.java
@@ -39,12 +39,14 @@
private Element m_elem;
/**
- * Id attribute (if found).
+ * Id attribute (if found)
+ * else use the annotation package name.
*/
private String m_id;
/**
- * Parent attribute (if found).
+ * Parent attribute (if found)
+ * else use the annotation package name.
*/
private String m_parent;
@@ -96,6 +98,17 @@
String namespace = s.substring(0, index);
return new Element(name, namespace);
}
+
+ /**
+ * Build the element object from the given descriptor.
+ * @param desc : annotation descriptor
+ * @return the package of the annotation
+ */
+ public static String getPackage(String desc) {
+ String s = (desc.replace('/', '.')).substring(1, desc.length() - 1);
+ int index = s.lastIndexOf('.');
+ return s.substring(0, index);
+ }
/**
* Visit a 'simple' annotation attribute.
@@ -154,6 +167,17 @@
public AnnotationVisitor visitArray(String arg0) {
return new SubArrayVisitor(m_elem, arg0);
}
+
+ /**
+ * Visits an enumeration attribute.
+ * @param arg0 the attribute name
+ * @param arg1 the enumeration descriptor
+ * @param arg2 the attribute value
+ * @see org.objectweb.asm.AnnotationVisitor#visitEnum(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public void visitEnum(String arg0, String arg1, String arg2) {
+ m_elem.addAttribute(new Attribute(arg0, arg2));
+ }
/**
* End of the visit.
@@ -164,7 +188,19 @@
if (m_root) {
if (m_id != null) {
m_collector.getIds().put(m_id, m_elem);
+ } else {
+ if (! m_collector.getIds().containsKey(m_elem.getNameSpace())) {
+ // If the namespace is not already used, add the annotation as the
+ // root element of this namespace.
+ m_collector.getIds().put(m_elem.getNameSpace(), m_elem);
+ } else {
+ // Already used, the element is the parent.
+ if (m_parent == null) {
+ m_parent = m_elem.getNameSpace();
+ }
+ }
}
+
m_collector.getElements().put(m_elem, m_parent);
}
}
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java
index e19d020..11d0603 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java
@@ -172,7 +172,9 @@
} else {
Element ref = (Element) getIds().get(reference);
if (ref == null) {
- System.err.println("The element " + reference + " is not declared - skipping the element " + current.toXMLString());
+ // Add to the root
+ m_elem.addElement(current);
+ // System.err.println("The element " + reference + " is not declared - skipping the element " + current.toXMLString());
} else {
ref.addElement(current);
}
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/SchemaResolver.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/SchemaResolver.java
index 376be2e..0cdc653 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/SchemaResolver.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/SchemaResolver.java
@@ -51,7 +51,7 @@
* @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
*/
public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, IOException {
+ throws SAXException, IOException {
URL url = getURL(systemId);
if (url == null) {
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java
index 9a03b83..9edd5cb 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java
@@ -270,7 +270,7 @@
* @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
*/
public void fatalError(SAXParseException saxparseexception)
- throws SAXException {
+ throws SAXException {
System.err.println("Fatal error during XML-Schema parsing : " + saxparseexception);
throw saxparseexception;
}
@@ -284,7 +284,7 @@
* @see org.xml.sax.ErrorHandler#warning(SAXParseException)
*/
public void warning(SAXParseException saxparseexception)
- throws SAXException {
+ throws SAXException {
System.err.println("Warning : an error was detected in the metadata file : " + saxparseexception);
}
diff --git a/ipojo/metadata/pom.xml b/ipojo/metadata/pom.xml
index f85c829..f89e030 100644
--- a/ipojo/metadata/pom.xml
+++ b/ipojo/metadata/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
@@ -39,22 +40,36 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Metadata</Bundle-Name>
- <Bundle-Vendor>
- The Apache Software Foundation
- </Bundle-Vendor>
- <Bundle-Description>
- iPOJO Metadata
- </Bundle-Description>
- <Export-Package>
- org.apache.felix.ipojo.metadata
- </Export-Package>
- <Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Metadata </Bundle-Description>
+ <Export-Package> org.apache.felix.ipojo.metadata </Export-Package>
+ <Include-Resource> META-INF/LICENCE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java b/ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
index 2b310f2..ba2ac5b 100644
--- a/ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
+++ b/ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
@@ -227,7 +227,7 @@
/**
* Gets the elements array of the element type given in parameter.
- * This method look for an empty namespace.
+ * This method looks for an empty namespace.
* @param name the type of the element to find (element name)
* @return the resulting element array (<code>null</code> if the search failed)
*/
diff --git a/ipojo/plugin/pom.xml b/ipojo/plugin/pom.xml
index 6621516..8c6e5b5 100644
--- a/ipojo/plugin/pom.xml
+++ b/ipojo/plugin/pom.xml
@@ -16,14 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>1.0.2</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-ipojo-plugin</artifactId>
<groupId>org.apache.felix</groupId>
@@ -68,5 +68,35 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ <param>**/archetype-resources/**/*</param>
+ <param>**/archetype.xml</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/ipojo/pom.xml b/ipojo/pom.xml
index d42545f..6f8f2da 100644
--- a/ipojo/pom.xml
+++ b/ipojo/pom.xml
@@ -81,6 +81,23 @@
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <excludeSubProjects>true</excludeSubProjects>
+ <excludes>
+ <param>**/*</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
<reporting>
<plugins>
<plugin>
diff --git a/ipojo/tests/composite/composite-runtime/pom.xml b/ipojo/tests/composite/composite-runtime/pom.xml
index a74ffb4..d2e2c92 100644
--- a/ipojo/tests/composite/composite-runtime/pom.xml
+++ b/ipojo/tests/composite/composite-runtime/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/composite/import-export/pom.xml b/ipojo/tests/composite/import-export/pom.xml
index a009a68..71b7cca 100644
--- a/ipojo/tests/composite/import-export/pom.xml
+++ b/ipojo/tests/composite/import-export/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/composite/service-instance/pom.xml b/ipojo/tests/composite/service-instance/pom.xml
index 89c42da..3961b5c 100644
--- a/ipojo/tests/composite/service-instance/pom.xml
+++ b/ipojo/tests/composite/service-instance/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/composite/service-providing/pom.xml b/ipojo/tests/composite/service-providing/pom.xml
index 8cb40a4..ea5343b 100644
--- a/ipojo/tests/composite/service-providing/pom.xml
+++ b/ipojo/tests/composite/service-providing/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/annotations/pom.xml b/ipojo/tests/core/annotations/pom.xml
index 911f031..92151fd 100644
--- a/ipojo/tests/core/annotations/pom.xml
+++ b/ipojo/tests/core/annotations/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/AnnotationsTestSuite.java b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/AnnotationsTestSuite.java
index 5b58924..edea2a5 100644
--- a/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/AnnotationsTestSuite.java
+++ b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/AnnotationsTestSuite.java
@@ -43,6 +43,7 @@
// External handler annotations
ots.addTestSuite(TemporalDependencies.class);
+ ots.addTestSuite(JMX.class);
return ots;
}
diff --git a/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/JMX.java b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/JMX.java
new file mode 100644
index 0000000..7714d3b
--- /dev/null
+++ b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/JMX.java
@@ -0,0 +1,14 @@
+package org.apache.felix.ipojo.test.scenarios.annotations;
+
+import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.metadata.Element;
+import org.apache.felix.ipojo.test.scenarios.util.Utils;
+
+public class JMX extends OSGiTestCase {
+
+ public void testSimple() {
+ Element meta = Utils.getMetatadata(context, "org.apache.felix.ipojo.test.scenarios.component.jmx.JMXSimple");
+ System.out.println("meta: " + meta);
+ }
+
+}
diff --git a/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/jmx/JMXSimple.java b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/jmx/JMXSimple.java
new file mode 100644
index 0000000..54cbbe7
--- /dev/null
+++ b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/jmx/JMXSimple.java
@@ -0,0 +1,25 @@
+package org.apache.felix.ipojo.test.scenarios.component.jmx;
+
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.handlers.jmx.Config;
+import org.apache.felix.ipojo.handlers.jmx.Method;
+import org.apache.felix.ipojo.handlers.jmx.Property;
+
+@Component
+@Config(domain="my-domain", usesMOSGi=false)
+public class JMXSimple {
+
+ @Property(name="prop", notification=true, rights="w")
+ String m_foo;
+
+ @Method(description="set the foo prop")
+ public void setFoo(String mes) {
+ System.out.println("Set foo to " + mes);
+ m_foo = mes;
+ }
+
+ @Method(description="get the foo prop")
+ public String getFoo() {
+ return m_foo;
+ }
+}
diff --git a/ipojo/tests/core/bad-configurations/pom.xml b/ipojo/tests/core/bad-configurations/pom.xml
index 41c8fc4..06dcf85 100644
--- a/ipojo/tests/core/bad-configurations/pom.xml
+++ b/ipojo/tests/core/bad-configurations/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/configadmin/pom.xml b/ipojo/tests/core/configadmin/pom.xml
index 9a74801..26ef7c7 100644
--- a/ipojo/tests/core/configadmin/pom.xml
+++ b/ipojo/tests/core/configadmin/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/configuration/pom.xml b/ipojo/tests/core/configuration/pom.xml
index 2f9b6d8..10044c2 100644
--- a/ipojo/tests/core/configuration/pom.xml
+++ b/ipojo/tests/core/configuration/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/external-handlers/pom.xml b/ipojo/tests/core/external-handlers/pom.xml
index 8ae8e35..85140ca 100644
--- a/ipojo/tests/core/external-handlers/pom.xml
+++ b/ipojo/tests/core/external-handlers/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/factories/pom.xml b/ipojo/tests/core/factories/pom.xml
index 892b3c9..6766a34 100644
--- a/ipojo/tests/core/factories/pom.xml
+++ b/ipojo/tests/core/factories/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/lifecycle-callback/pom.xml b/ipojo/tests/core/lifecycle-callback/pom.xml
index d788add..349b700 100644
--- a/ipojo/tests/core/lifecycle-callback/pom.xml
+++ b/ipojo/tests/core/lifecycle-callback/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/lifecycle-controller/pom.xml b/ipojo/tests/core/lifecycle-controller/pom.xml
index b2f7e62..86a0419 100644
--- a/ipojo/tests/core/lifecycle-controller/pom.xml
+++ b/ipojo/tests/core/lifecycle-controller/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml b/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
index 5de12d3..add922a 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/service-dependency-comparator/pom.xml b/ipojo/tests/core/service-dependency-comparator/pom.xml
index 56ab721..4d13407 100644
--- a/ipojo/tests/core/service-dependency-comparator/pom.xml
+++ b/ipojo/tests/core/service-dependency-comparator/pom.xml
@@ -19,8 +19,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
- <name>iPOJO Service Dependency (Binding Policy) Test Suite</name>
- <artifactId>tests.core.service.dependency.bindingpolicy</artifactId>
+ <name>iPOJO Service Dependency Comparator Test Suite</name>
+ <artifactId>tests.core.service.dependency.comparator</artifactId>
<groupId>ipojo.tests</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -68,7 +68,8 @@
${pom.artifactId}
</Bundle-SymbolicName>
<Private-Package>
- org.apache.felix.ipojo.test.scenarios.service.dependency.comparator
+ org.apache.felix.ipojo.test.scenarios.service.dependency.comparator,
+ org.apache.felix.ipojo.test.scenarios.service.dependency.comparator.component
</Private-Package>
<Test-Suite>
org.apache.felix.ipojo.test.scenarios.service.dependency.comparator.ComparatorTestCase
diff --git a/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java b/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java
index 6cde37c..c58acf3 100644
--- a/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java
+++ b/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java
@@ -26,7 +26,7 @@
}
public void tearDown() {
- dynInstance.dispose();
+ dynInstance.dispose();
dpInstance.dispose();
}
@@ -46,6 +46,8 @@
assertEquals("fs grade -1", 2, fsGrade);
assertEquals("fs2 grade -1", 2, fs2Grade);
assertEquals("fss grade size -1", 2, fssGrades.length);
+
+
assertEquals("fss grade[0] -1", 2, fssGrades[0]);
assertEquals("fss grade[1] -1", 1, fssGrades[1]);
diff --git a/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java b/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java
index 0ce96ff..9881e1f 100644
--- a/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java
+++ b/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java
@@ -42,6 +42,11 @@
props.put("fs2", new Integer(fs2.getInt()));
int[] grades = new int[fss.length];
+
+ for (int i = 0; i < grades.length; i++) {
+ grades[i] = fss[i].getInt();
+ }
+
props.put("fss", grades);
return props;
diff --git a/ipojo/tests/core/service-dependency-filter/pom.xml b/ipojo/tests/core/service-dependency-filter/pom.xml
index d5c9654..49db1d6 100644
--- a/ipojo/tests/core/service-dependency-filter/pom.xml
+++ b/ipojo/tests/core/service-dependency-filter/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/service-dependency/pom.xml b/ipojo/tests/core/service-dependency/pom.xml
index e870c5b..f8490b5 100644
--- a/ipojo/tests/core/service-dependency/pom.xml
+++ b/ipojo/tests/core/service-dependency/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/core/service-providing/pom.xml b/ipojo/tests/core/service-providing/pom.xml
index d4fbf38..cfda6a9 100644
--- a/ipojo/tests/core/service-providing/pom.xml
+++ b/ipojo/tests/core/service-providing/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/handler/eventadmin/pom.xml b/ipojo/tests/handler/eventadmin/pom.xml
index 7a10a31..a1fecaa 100644
--- a/ipojo/tests/handler/eventadmin/pom.xml
+++ b/ipojo/tests/handler/eventadmin/pom.xml
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/tests/handler/temporal/pom.xml b/ipojo/tests/handler/temporal/pom.xml
index 20d7df0..54fe662 100644
--- a/ipojo/tests/handler/temporal/pom.xml
+++ b/ipojo/tests/handler/temporal/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/handler/whiteboard/pom.xml b/ipojo/tests/handler/whiteboard/pom.xml
index cd91d49..15970c8 100644
--- a/ipojo/tests/handler/whiteboard/pom.xml
+++ b/ipojo/tests/handler/whiteboard/pom.xml
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/manipulator/creation/pom.xml b/ipojo/tests/manipulator/creation/pom.xml
index f83a988..c8dc414 100644
--- a/ipojo/tests/manipulator/creation/pom.xml
+++ b/ipojo/tests/manipulator/creation/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/manipulator/manipulation/pom.xml b/ipojo/tests/manipulator/manipulation/pom.xml
index c4f3f6b..0661202 100644
--- a/ipojo/tests/manipulator/manipulation/pom.xml
+++ b/ipojo/tests/manipulator/manipulation/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/manipulator/manipulator-java5/pom.xml b/ipojo/tests/manipulator/manipulator-java5/pom.xml
index e526cd6..71c90c5 100644
--- a/ipojo/tests/manipulator/manipulator-java5/pom.xml
+++ b/ipojo/tests/manipulator/manipulator-java5/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/manipulator/metadata/pom.xml b/ipojo/tests/manipulator/metadata/pom.xml
index 643c845..64d53d7 100644
--- a/ipojo/tests/manipulator/metadata/pom.xml
+++ b/ipojo/tests/manipulator/metadata/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ipojo/tests/manipulator/primitives/pom.xml b/ipojo/tests/manipulator/primitives/pom.xml
index f83df54..c0d4ad9 100644
--- a/ipojo/tests/manipulator/primitives/pom.xml
+++ b/ipojo/tests/manipulator/primitives/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>