This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 59049a631 [AXIOM-506] Move Activation related classes to
axiom-activation
59049a631 is described below
commit 59049a631e4125940010b07006788fe2e333d60f
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Nov 13 11:59:33 2022 +0000
[AXIOM-506] Move Activation related classes to axiom-activation
---
apidocs/pom.xml | 5 +++++
axiom-activation/pom.xml | 18 ++++++++++++++++++
.../axiom/ext/activation/SizeAwareDataSource.java | 0
.../org/apache/axiom/ext/activation/package.html | 0
.../axiom/mime/activation/PartDataHandler.java | 0
.../axiom/mime/activation/PartDataHandlerBlob.java | 0
.../mime/activation/PartDataHandlerBlobFactory.java | 0
.../axiom/mime/activation/PartDataSource.java | 0
.../java/org/apache/axiom/mime/activation/Util.java | 0
.../axiom/util/activation/BlobDataHandler.java | 0
.../axiom/util/activation/BlobDataSource.java | 0
.../axiom/util/activation/DataHandlerBlob.java | 0
.../activation/DataHandlerContentTypeProvider.java | 0
.../axiom/util/activation/DataHandlerUtils.java | 0
.../axiom/util/activation/DataHandlerWrapper.java | 0
.../axiom/util/activation/DataSourceUtils.java | 0
.../axiom/util/activation/EmptyDataSource.java | 0
.../org/apache/axiom/util/activation/package.html | 0
.../DataHandlerContentTypeProviderTest.java | 0
.../util/activation/DataHandlerWrapperTest.java | 0
axiom-api/pom.xml | 21 ---------------------
axiom-jaxb/pom.xml | 5 +++++
axiom-legacy-attachments/pom.xml | 5 +++++
samples/pom.xml | 5 +++++
systests/eclipse-tests/pom.xml | 5 -----
.../eclipse-tests/src/test/java/EclipseTest.java | 1 -
.../java/org/apache/axiom/test/BlueprintTest.java | 1 -
.../org/apache/axiom/test/DataSourceUtilsTest.java | 1 +
.../java/org/apache/axiom/test/FactoryTest.java | 1 -
.../test/java/org/apache/axiom/test/JAXBTest.java | 1 +
.../test/java/org/apache/axiom/test/SJSXPTest.java | 1 -
.../java/org/apache/axiom/test/SystemDepsTest.java | 1 -
.../org/apache/axiom/test/UsesConstraintsTest.java | 1 -
33 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 70a88c9eb..463b3ad80 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -41,6 +41,11 @@
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-activation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axiom-jaxb</artifactId>
diff --git a/axiom-activation/pom.xml b/axiom-activation/pom.xml
index 94e955c70..7a95ab50e 100644
--- a/axiom-activation/pom.xml
+++ b/axiom-activation/pom.xml
@@ -41,6 +41,16 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -49,6 +59,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.mail.util;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git
a/axiom-api/src/main/java/org/apache/axiom/ext/activation/SizeAwareDataSource.java
b/axiom-activation/src/main/java/org/apache/axiom/ext/activation/SizeAwareDataSource.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/ext/activation/SizeAwareDataSource.java
rename to
axiom-activation/src/main/java/org/apache/axiom/ext/activation/SizeAwareDataSource.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/ext/activation/package.html
b/axiom-activation/src/main/java/org/apache/axiom/ext/activation/package.html
similarity index 100%
rename from axiom-api/src/main/java/org/apache/axiom/ext/activation/package.html
rename to
axiom-activation/src/main/java/org/apache/axiom/ext/activation/package.html
diff --git
a/axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataHandler.java
b/axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataHandler.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataHandler.java
rename to
axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataHandler.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlob.java
b/axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlob.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlob.java
rename to
axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlob.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlobFactory.java
b/axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlobFactory.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlobFactory.java
rename to
axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataHandlerBlobFactory.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataSource.java
b/axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataSource.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/mime/activation/PartDataSource.java
rename to
axiom-activation/src/main/java/org/apache/axiom/mime/activation/PartDataSource.java
diff --git a/axiom-api/src/main/java/org/apache/axiom/mime/activation/Util.java
b/axiom-activation/src/main/java/org/apache/axiom/mime/activation/Util.java
similarity index 100%
rename from axiom-api/src/main/java/org/apache/axiom/mime/activation/Util.java
rename to
axiom-activation/src/main/java/org/apache/axiom/mime/activation/Util.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerBlob.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerBlob.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerBlob.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerBlob.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerContentTypeProvider.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerContentTypeProvider.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerContentTypeProvider.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerContentTypeProvider.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerUtils.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerUtils.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerUtils.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerUtils.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerWrapper.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerWrapper.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/DataHandlerWrapper.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/DataHandlerWrapper.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/activation/package.html
b/axiom-activation/src/main/java/org/apache/axiom/util/activation/package.html
similarity index 100%
rename from
axiom-api/src/main/java/org/apache/axiom/util/activation/package.html
rename to
axiom-activation/src/main/java/org/apache/axiom/util/activation/package.html
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
b/axiom-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
similarity index 100%
rename from
axiom-api/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
rename to
axiom-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/activation/DataHandlerWrapperTest.java
b/axiom-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerWrapperTest.java
similarity index 100%
rename from
axiom-api/src/test/java/org/apache/axiom/util/activation/DataHandlerWrapperTest.java
rename to
axiom-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerWrapperTest.java
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index 52b9828f8..8637b319f 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -56,10 +56,6 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.framework</artifactId>
@@ -199,7 +195,6 @@
org.apache.axiom.*;-split-package:=merge-first;-noimport:=true
</Export-Package>
<Import-Package>
- javax.mail.util;resolution:=optional,
org.jaxen.*;resolution:=optional,
org.codehaus.stax2;resolution:=optional,
org.apache.james.mime4j.*;version="${range;[==,=+)}",
@@ -238,22 +233,6 @@
</value>
</visibilityRules>
</layer>
- <layer>
- <packages>
- <value>javax.activation</value>
- </packages>
- <visibilityRules>
- <value>
- <packages>
-
<value>org.apache.axiom.attachments</value>
-
<value>org.apache.axiom.ext.activation</value>
-
<value>org.apache.axiom.mime.activation</value>
-
<value>org.apache.axiom.util.activation</value>
- </packages>
-
<allowPublicUsage>true</allowPublicUsage>
- </value>
- </visibilityRules>
- </layer>
<layer>
<packages>
<value>org.apache.axiom.util</value>
diff --git a/axiom-jaxb/pom.xml b/axiom-jaxb/pom.xml
index 074048195..a4e853ed2 100644
--- a/axiom-jaxb/pom.xml
+++ b/axiom-jaxb/pom.xml
@@ -39,6 +39,11 @@
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-activation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/axiom-legacy-attachments/pom.xml b/axiom-legacy-attachments/pom.xml
index 76b0938ff..8183903fa 100644
--- a/axiom-legacy-attachments/pom.xml
+++ b/axiom-legacy-attachments/pom.xml
@@ -37,6 +37,11 @@
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-activation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 3dff6355a..be4cf82cb 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -44,6 +44,11 @@
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-activation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axiom-impl</artifactId>
diff --git a/systests/eclipse-tests/pom.xml b/systests/eclipse-tests/pom.xml
index e9c6697ce..2d8a443d4 100644
--- a/systests/eclipse-tests/pom.xml
+++ b/systests/eclipse-tests/pom.xml
@@ -50,11 +50,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
diff --git a/systests/eclipse-tests/src/test/java/EclipseTest.java
b/systests/eclipse-tests/src/test/java/EclipseTest.java
index c31fbb705..93d5013fc 100644
--- a/systests/eclipse-tests/src/test/java/EclipseTest.java
+++ b/systests/eclipse-tests/src/test/java/EclipseTest.java
@@ -52,7 +52,6 @@ public class EclipseTest {
return options(
frameworkProperty(EquinoxLocations.PROP_HOME_LOCATION_AREA).value("target"),
// Don't start bundles. We expect Equinox to start them lazily.
-
url("link:classpath:com.sun.activation.jakarta.activation.link").start(false),
url("link:classpath:org.apache.commons.commons-io.link").start(false),
url("link:classpath:org.apache.james.apache-mime4j-core.link").start(false),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link").start(false),
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
index 307f143f0..5b2452892 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
@@ -43,7 +43,6 @@ public class BlueprintTest {
url("link:classpath:org.apache.aries.proxy.link"),
url("link:classpath:org.apache.aries.blueprint.api.link"),
url("link:classpath:org.apache.aries.blueprint.core.link"),
-
url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.commons.commons-io.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
index 62ddd0063..f72bf0993 100644
---
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
+++
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
@@ -45,6 +45,7 @@ public class DataSourceUtilsTest {
url("link:classpath:org.apache.commons.commons-io.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
+
url("link:classpath:org.apache.ws.commons.axiom.axiom-activation.link"),
junitBundles());
}
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
index f5c404b53..ed5502f32 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
@@ -52,7 +52,6 @@ public class FactoryTest {
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
url("link:classpath:com.fasterxml.woodstox.woodstox-core.link"),
-
url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.commons.commons-io.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
index 210213154..652bc8f3d 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
@@ -60,6 +60,7 @@ public class JAXBTest {
url("link:classpath:org.glassfish.hk2.osgi-resource-locator.link"),
url("link:classpath:jakarta.xml.bind-api.link"),
url("link:classpath:com.sun.xml.bind.jaxb-osgi.link"),
+
url("link:classpath:org.apache.ws.commons.axiom.axiom-activation.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-jaxb.link"),
filteredSystemPackages("javax.xml.stream"),
junitBundles());
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
index e20795fea..9b572e2d3 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
@@ -51,7 +51,6 @@ public class SJSXPTest {
return options(
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:org.apache.servicemix.bundles.jaxp-ri.link"),
-
url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.commons.commons-io.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
index 9cbdd8a90..05ef6924a 100644
---
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
+++
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
@@ -44,7 +44,6 @@ public class SystemDepsTest {
@Configuration
public static Option[] configuration() {
return options(
-
url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.commons.commons-io.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
diff --git
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
index 60aa71d5f..9386fe625 100644
---
a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
+++
b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
@@ -107,7 +107,6 @@ public class UsesConstraintsTest {
bundles.add(context.installBundle("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"));
bundles.add(context.installBundle("link:classpath:stax2-api.link"));
bundles.add(context.installBundle("link:classpath:com.fasterxml.woodstox.woodstox-core.link"));
-
bundles.add(context.installBundle("link:classpath:com.sun.activation.jakarta.activation.link"));
bundles.add(context.installBundle("link:classpath:org.apache.commons.commons-io.link"));
bundles.add(context.installBundle("link:classpath:org.apache.james.apache-mime4j-core.link"));
bundles.add(context.installBundle("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"));
