This is an automated email from the ASF dual-hosted git repository. elecharny pushed a commit to branch 2.2.X in repository https://gitbox.apache.org/repos/asf/mina.git
commit 252130da0fd76d9c2399b75a9f1a13efa313f133 Author: emmanuel lecharny <elecha...@apache.org> AuthorDate: Thu Dec 19 10:11:46 2024 +0100 Solved some link issues --- mina-core/pom.xml.releaseBackup | 116 --------------------- mina-core/pom.xml.tag | 116 --------------------- .../java/org/apache/mina/core/buffer/IoBuffer.java | 2 +- .../buffer/matcher/WildcardClassNameMatcher.java | 2 +- .../ObjectSerializationCodecFactory.java | 2 +- .../serialization/ObjectSerializationDecoder.java | 2 +- 6 files changed, 4 insertions(+), 236 deletions(-) diff --git a/mina-core/pom.xml.releaseBackup b/mina-core/pom.xml.releaseBackup deleted file mode 100644 index 88d03d64b..000000000 --- a/mina-core/pom.xml.releaseBackup +++ /dev/null @@ -1,116 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mina</groupId> - <artifactId>mina-parent</artifactId> - <version>2.2.4-SNAPSHOT</version> - </parent> - - <artifactId>mina-core</artifactId> - <name>Apache MINA Core</name> - <packaging>bundle</packaging> - - <dependencies> - <!-- Test dependencies --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</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, - org.apache.mina.core.buffer, - org.apache.mina.core.buffer.matcher, - org.apache.mina.core.file, - org.apache.mina.core.filterchain, - org.apache.mina.core.future, - org.apache.mina.core.polling, - org.apache.mina.core.service, - org.apache.mina.core.session, - org.apache.mina.core.write, - org.apache.mina.filter, - org.apache.mina.filter.buffer, - org.apache.mina.filter.codec, - org.apache.mina.filter.codec.demux, - org.apache.mina.filter.codec.prefixedstring, - org.apache.mina.filter.codec.serialization, - org.apache.mina.filter.codec.statemachine, - org.apache.mina.filter.codec.textline, - org.apache.mina.filter.errorgenerating, - org.apache.mina.filter.executor, - org.apache.mina.filter.firewall, - org.apache.mina.filter.keepalive, - org.apache.mina.filter.logging, - org.apache.mina.filter.ssl, - org.apache.mina.filter.statistic, - org.apache.mina.filter.stream, - org.apache.mina.filter.util, - org.apache.mina.handler.chain, - org.apache.mina.handler.demux, - org.apache.mina.handler.multiton, - org.apache.mina.handler.stream, - org.apache.mina.proxy, - org.apache.mina.proxy.event, - org.apache.mina.proxy.filter, - org.apache.mina.proxy.handlers, - org.apache.mina.proxy.handlers.http, - org.apache.mina.proxy.handlers.http.basic, - org.apache.mina.proxy.handlers.http.digest, - org.apache.mina.proxy.handlers.http.ntlm, - org.apache.mina.proxy.handlers.socks, - org.apache.mina.proxy.session, - org.apache.mina.proxy.utils, - org.apache.mina.transport.socket, - org.apache.mina.transport.socket.nio, - org.apache.mina.transport.vmpipe, - org.apache.mina.util, - org.apache.mina.util.byteaccess - </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 deleted file mode 100644 index d73e3c0c4..000000000 --- a/mina-core/pom.xml.tag +++ /dev/null @@ -1,116 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mina</groupId> - <artifactId>mina-parent</artifactId> - <version>2.2.4</version> - </parent> - - <artifactId>mina-core</artifactId> - <name>Apache MINA Core</name> - <packaging>bundle</packaging> - - <dependencies> - <!-- Test dependencies --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</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, - org.apache.mina.core.buffer, - org.apache.mina.core.buffer.matcher, - org.apache.mina.core.file, - org.apache.mina.core.filterchain, - org.apache.mina.core.future, - org.apache.mina.core.polling, - org.apache.mina.core.service, - org.apache.mina.core.session, - org.apache.mina.core.write, - org.apache.mina.filter, - org.apache.mina.filter.buffer, - org.apache.mina.filter.codec, - org.apache.mina.filter.codec.demux, - org.apache.mina.filter.codec.prefixedstring, - org.apache.mina.filter.codec.serialization, - org.apache.mina.filter.codec.statemachine, - org.apache.mina.filter.codec.textline, - org.apache.mina.filter.errorgenerating, - org.apache.mina.filter.executor, - org.apache.mina.filter.firewall, - org.apache.mina.filter.keepalive, - org.apache.mina.filter.logging, - org.apache.mina.filter.ssl, - org.apache.mina.filter.statistic, - org.apache.mina.filter.stream, - org.apache.mina.filter.util, - org.apache.mina.handler.chain, - org.apache.mina.handler.demux, - org.apache.mina.handler.multiton, - org.apache.mina.handler.stream, - org.apache.mina.proxy, - org.apache.mina.proxy.event, - org.apache.mina.proxy.filter, - org.apache.mina.proxy.handlers, - org.apache.mina.proxy.handlers.http, - org.apache.mina.proxy.handlers.http.basic, - org.apache.mina.proxy.handlers.http.digest, - org.apache.mina.proxy.handlers.http.ntlm, - org.apache.mina.proxy.handlers.socks, - org.apache.mina.proxy.session, - org.apache.mina.proxy.utils, - org.apache.mina.transport.socket, - org.apache.mina.transport.socket.nio, - org.apache.mina.transport.vmpipe, - org.apache.mina.util, - org.apache.mina.util.byteaccess - </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/core/buffer/IoBuffer.java b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java index e3debdbd2..b68f10824 100644 --- a/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java +++ b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java @@ -2134,7 +2134,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * unless they are otherwise rejected. * * @param patterns Wildcard file name patterns as defined by - * {@link org.apache.commons.io.FilenameUtils#wildcardMatch(String, String) FilenameUtils.wildcardMatch} + * org.apache.commons.io.FilenameUtils.wildcardMatch(String, String) * @return this object */ public abstract IoBuffer accept(String... patterns); diff --git a/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/WildcardClassNameMatcher.java b/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/WildcardClassNameMatcher.java index 8e3c12e64..f88d22ef2 100644 --- a/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/WildcardClassNameMatcher.java +++ b/mina-core/src/main/java/org/apache/mina/core/buffer/matcher/WildcardClassNameMatcher.java @@ -20,7 +20,7 @@ package org.apache.mina.core.buffer.matcher; /** * A {@link ClassNameMatcher} that uses simplified regular expressions - * provided by {@link org.apache.commons.io.FilenameUtils#wildcardMatch(String, String)} + * provided by org.apache.commons.io.FilenameUtils.wildcardMatch(String, String) * <p> * This object is immutable and thread-safe. * </p> diff --git a/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java b/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java index 2d3a88f9f..390c6a9d9 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java +++ b/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java @@ -153,7 +153,7 @@ public class ObjectSerializationCodecFactory implements ProtocolCodecFactory { * unless they are otherwise rejected. * * @param patterns Wildcard file name patterns as defined by - * {@link org.apache.commons.io.FilenameUtils#wildcardMatch(String, String) FilenameUtils.wildcardMatch} + * org.apache.commons.io.FilenameUtils.wildcardMatch(String, String) */ public void accept(String... patterns) { for (String pattern:patterns) { diff --git a/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java b/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java index ae324873b..b8f10f590 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java +++ b/mina-core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java @@ -134,7 +134,7 @@ public class ObjectSerializationDecoder extends CumulativeProtocolDecoder { * unless they are otherwise rejected. * * @param patterns Wildcard file name patterns as defined by - * {@link org.apache.commons.io.FilenameUtils#wildcardMatch(String, String) FilenameUtils.wildcardMatch} + * @link org.apache.commons.io.FilenameUtils.wildcardMatch(String, String) */ public void accept(String... patterns) { for (String pattern:patterns) {