This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.0.X by this push:
new be4a67402 Fixed some more Javadoc issues
be4a67402 is described below
commit be4a674028f3b060cb5dfe74fcdd864db2fc9e62
Author: emmanuel lecharny <elecha...@apache.org>
AuthorDate: Fri Sep 27 13:23:33 2024 +0200
Fixed some more Javadoc issues
---
mina-core/pom.xml.next | 108 +++++++++++++++++++++
mina-core/pom.xml.releaseBackup | 108 +++++++++++++++++++++
mina-core/pom.xml.tag | 108 +++++++++++++++++++++
.../mina/filter/keepalive/KeepAliveFilter.java | 1 +
mina-integration-jmx/pom.xml.next | 91 +++++++++++++++++
mina-integration-jmx/pom.xml.releaseBackup | 91 +++++++++++++++++
mina-integration-jmx/pom.xml.tag | 91 +++++++++++++++++
.../org/apache/mina/integration/jmx/package.html | 2 +-
8 files changed, 599 insertions(+), 1 deletion(-)
diff --git a/mina-core/pom.xml.next b/mina-core/pom.xml.next
new file mode 100644
index 000000000..2c22aa08e
--- /dev/null
+++ b/mina-core/pom.xml.next
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-parent</artifactId>
+ <version>2.0.27-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mina-core</artifactId>
+ <name>Apache MINA Core</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.mina.core;version=${project.version};-noimport:=true,
+
org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
+
org.apache.mina.core.file;version=${project.version};-noimport:=true,
+
org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
+
org.apache.mina.core.future;version=${project.version};-noimport:=true,
+
org.apache.mina.core.polling;version=${project.version};-noimport:=true,
+
org.apache.mina.core.service;version=${project.version};-noimport:=true,
+
org.apache.mina.core.session;version=${project.version};-noimport:=true,
+
org.apache.mina.core.write;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.util;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
+ org.apache.mina.util;version=${project.version};-noimport:=true,
+
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+
javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
diff --git a/mina-core/pom.xml.releaseBackup b/mina-core/pom.xml.releaseBackup
new file mode 100644
index 000000000..f94bc2efa
--- /dev/null
+++ b/mina-core/pom.xml.releaseBackup
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-parent</artifactId>
+ <version>2.0.26-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mina-core</artifactId>
+ <name>Apache MINA Core</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.mina.core;version=${project.version};-noimport:=true,
+
org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
+
org.apache.mina.core.file;version=${project.version};-noimport:=true,
+
org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
+
org.apache.mina.core.future;version=${project.version};-noimport:=true,
+
org.apache.mina.core.polling;version=${project.version};-noimport:=true,
+
org.apache.mina.core.service;version=${project.version};-noimport:=true,
+
org.apache.mina.core.session;version=${project.version};-noimport:=true,
+
org.apache.mina.core.write;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.util;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
+ org.apache.mina.util;version=${project.version};-noimport:=true,
+
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+
javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
diff --git a/mina-core/pom.xml.tag b/mina-core/pom.xml.tag
new file mode 100644
index 000000000..8100cde85
--- /dev/null
+++ b/mina-core/pom.xml.tag
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-parent</artifactId>
+ <version>2.0.26</version>
+ </parent>
+
+ <artifactId>mina-core</artifactId>
+ <name>Apache MINA Core</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.mina.core;version=${project.version};-noimport:=true,
+
org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
+
org.apache.mina.core.file;version=${project.version};-noimport:=true,
+
org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
+
org.apache.mina.core.future;version=${project.version};-noimport:=true,
+
org.apache.mina.core.polling;version=${project.version};-noimport:=true,
+
org.apache.mina.core.service;version=${project.version};-noimport:=true,
+
org.apache.mina.core.session;version=${project.version};-noimport:=true,
+
org.apache.mina.core.write;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
+
org.apache.mina.filter.util;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
+
org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
+
org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
+
org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
+ org.apache.mina.util;version=${project.version};-noimport:=true,
+
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+
javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
b/mina-core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
index 515ff90e9..986cf3cd0 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
@@ -55,6 +55,7 @@ import org.apache.mina.core.write.WriteRequest;
* message:
*
* <table border="1">
+ * <caption>Message</caption>
* <tr>
* <th>Name</th><th>Description</th><th>Implementation</th>
* </tr>
diff --git a/mina-integration-jmx/pom.xml.next
b/mina-integration-jmx/pom.xml.next
new file mode 100644
index 000000000..1357149c9
--- /dev/null
+++ b/mina-integration-jmx/pom.xml.next
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-parent</artifactId>
+ <version>2.0.27-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mina-integration-jmx</artifactId>
+ <name>Apache MINA JMX Integration</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-beans</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-ognl</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+
<Bundle-SymbolicName>${project.groupId}.integration.jmx</Bundle-SymbolicName>
+ <Export-Package>
+
org.apache.mina.integration.jmx;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ ognl;version=${version.ognl},
+ org.apache.mina.core.filterchain;version=${project.version},
+ org.apache.mina.core.service;version=${project.version},
+ org.apache.mina.core.session;version=${project.version},
+ org.apache.mina.filter.executor;version=${project.version},
+ org.apache.mina.integration.beans;version=${project.version},
+ org.apache.mina.integration.ognl;version=${project.version},
+ org.slf4j;version=${osgi-min-version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/mina-integration-jmx/pom.xml.releaseBackup
b/mina-integration-jmx/pom.xml.releaseBackup
new file mode 100644
index 000000000..eef6f1f72
--- /dev/null
+++ b/mina-integration-jmx/pom.xml.releaseBackup
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-parent</artifactId>
+ <version>2.0.26-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mina-integration-jmx</artifactId>
+ <name>Apache MINA JMX Integration</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-beans</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-ognl</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+
<Bundle-SymbolicName>${project.groupId}.integration.jmx</Bundle-SymbolicName>
+ <Export-Package>
+
org.apache.mina.integration.jmx;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ ognl;version=${version.ognl},
+ org.apache.mina.core.filterchain;version=${project.version},
+ org.apache.mina.core.service;version=${project.version},
+ org.apache.mina.core.session;version=${project.version},
+ org.apache.mina.filter.executor;version=${project.version},
+ org.apache.mina.integration.beans;version=${project.version},
+ org.apache.mina.integration.ognl;version=${project.version},
+ org.slf4j;version=${osgi-min-version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/mina-integration-jmx/pom.xml.tag b/mina-integration-jmx/pom.xml.tag
new file mode 100644
index 000000000..6d48f1457
--- /dev/null
+++ b/mina-integration-jmx/pom.xml.tag
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-parent</artifactId>
+ <version>2.0.26</version>
+ </parent>
+
+ <artifactId>mina-integration-jmx</artifactId>
+ <name>Apache MINA JMX Integration</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-beans</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-ognl</artifactId>
+ <version>${project.version}</version>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+
<Bundle-SymbolicName>${project.groupId}.integration.jmx</Bundle-SymbolicName>
+ <Export-Package>
+
org.apache.mina.integration.jmx;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ ognl;version=${version.ognl},
+ org.apache.mina.core.filterchain;version=${project.version},
+ org.apache.mina.core.service;version=${project.version},
+ org.apache.mina.core.session;version=${project.version},
+ org.apache.mina.filter.executor;version=${project.version},
+ org.apache.mina.integration.beans;version=${project.version},
+ org.apache.mina.integration.ognl;version=${project.version},
+ org.slf4j;version=${osgi-min-version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/package.html
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/package.html
index 026ad6e7a..8314a6b96 100644
---
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/package.html
+++
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/package.html
@@ -21,7 +21,7 @@
<body>
JMX (Java Management eXtension) integration.
-<h2>Monitoring Your MINA Services and Sessions</h3>
+<h2>Monitoring Your MINA Services and Sessions</h2>
<h3>Monitoring an IoService</h3>
<pre>
