This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/CXFAllTransformer in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git
commit 95e5a1f34d7f57ad02e08882ebd57059da00873a Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Oct 8 13:38:38 2026 +0100 Remove unused CXFAllTransformer --- buildtools/pom.xml | 13 -- .../org/apache/cxf/maven/CXFAllTransformer.java | 132 --------------------- buildtools/src/main/resources/META-INF/NOTICE | 62 +--------- 3 files changed, 1 insertion(+), 206 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index d475b37..85abfdc 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -35,12 +35,6 @@ </properties> <dependencies> - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - <optional>true</optional> - </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> @@ -65,13 +59,6 @@ <version>2.2.1</version> <optional>true</optional> </dependency> - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.6.2</version> - <optional>true</optional> - <scope>provided</scope> - </dependency> <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-java</artifactId> diff --git a/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java b/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java deleted file mode 100644 index 3ce3e38..0000000 --- a/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java +++ /dev/null @@ -1,132 +0,0 @@ -/** - * 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.cxf.maven; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.jar.JarEntry; -import java.util.jar.JarOutputStream; - -import org.apache.maven.plugins.shade.resource.ResourceTransformer; -import org.jdom.Content; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.JDOMException; -import org.jdom.input.SAXBuilder; - -public class CXFAllTransformer implements ResourceTransformer { - - byte buffer[] = new byte[1024]; - Map<String, ByteArrayOutputStream> extensions - = new LinkedHashMap<String, ByteArrayOutputStream>(); - String lastResource; - - public CXFAllTransformer() { - super(); - } - - public boolean canTransformResource(String r) { - if (r.startsWith("META-INF/cxf/cxf-extension-") - && r.endsWith(".xml")) { - lastResource = r; - return true; - } - return false; - } - public boolean hasTransformedResource() { - return !extensions.isEmpty(); - } - - public void processResource(String resource, InputStream is, List relocators) throws IOException { - processResource(is); - } - public void processResource(InputStream is) throws IOException { - ByteArrayOutputStream bout = new ByteArrayOutputStream(1024); - int i = is.read(buffer); - while (i != -1) { - bout.write(buffer, 0, i); - i = is.read(buffer); - } - extensions.put(lastResource, bout); - } - public void modifyOutputStream(JarOutputStream jos) throws IOException { - List<String> imps = new ArrayList<String>(extensions.keySet()); - for (Map.Entry<String, ByteArrayOutputStream> ent : extensions.entrySet()) { - jos.putNextEntry(new JarEntry(ent.getKey())); - ent.getValue().writeTo(jos); - try { - Document r = new SAXBuilder() - .build(new ByteArrayInputStream(ent.getValue().toByteArray())); - - Element root = r.getRootElement(); - for (Iterator itr = root.getChildren().iterator(); itr.hasNext();) { - Content n = (Content)itr.next(); - if (n instanceof Element) { - Element e = (Element)n; - if ("import".equals(e.getName()) - && "http://www.springframework.org/schema/beans".equals(e.getNamespaceURI())) { - - //remove stuff that is imported from other extensions to - //keep them from being loaded twice. (it's not an issue - //to load them twice, there just is a performance - //penalty in doing so - String loc = e.getAttributeValue("resource"); - if (loc.startsWith("classpath:META-INF/cxf/cxf")) { - - loc = loc.substring(10); - imps.remove(loc); - } - } - } - } - } catch (JDOMException e) { - throw new RuntimeException(e); - } - } - - if (imps.size() > 0) { - jos.putNextEntry(new JarEntry("META-INF/cxf/cxf-all.xml")); - Writer writer = new OutputStreamWriter(jos, "UTF-8"); - writer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); - writer.append("<beans xmlns=\"http://www.springframework.org/schema/beans\"\n";); - writer.append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";); - writer.append(" xsi:schemaLocation=\""); - writer.append("http://www.springframework.org/schema/beans "); - writer.append("http://www.springframework.org/schema/beans/spring-beans.xsd\";>\n"); - writer.append(" <import resource=\"classpath:META-INF/cxf/cxf.xml\"/>\n"); - for (String res : imps) { - writer.append(" <import resource=\"classpath:"); - writer.append(res); - writer.append("\"/>\n"); - } - writer.append("</beans>"); - writer.flush(); - } - } -} - diff --git a/buildtools/src/main/resources/META-INF/NOTICE b/buildtools/src/main/resources/META-INF/NOTICE index 80e751f..d3e615e 100644 --- a/buildtools/src/main/resources/META-INF/NOTICE +++ b/buildtools/src/main/resources/META-INF/NOTICE @@ -4,67 +4,7 @@ // ------------------------------------------------------------------ Apache CXF Buildtools -Copyright 2006-2022 The Apache Software Foundation +Copyright 2006-2026 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - - -This product includes/uses software, Maven Profile Model (http://maven.apache.org/maven-profile), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Unnamed - junit:junit:jar:3.8.1 - -This product includes/uses software, Default Plexus Container, -developed by Codehaus (http://www.codehaus.org/) - -This product includes/uses software, Maven Project Builder (http://maven.apache.org/maven-project), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Maven Local Settings Model (http://maven.apache.org/maven-settings), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, classworlds (http://classworlds.codehaus.org/), -developed by The Codehaus (http://codehaus.org/) - -This product includes/uses software, Plexus Common Utilities, -developed by Codehaus (http://www.codehaus.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Maven Repository Metadata Model (http://maven.apache.org/maven-repository-metadata), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Unnamed - jdom:jdom:jar:1.0 - -This product includes/uses software, Maven Model (http://maven.apache.org/maven-model), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, ASM All (http://asm.objectweb.org/asm-all), -developed by ObjectWeb (http://www.objectweb.org/) - -This product includes/uses software, Maven Artifact (http://maven.apache.org/maven-artifact), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Maven Artifact Manager (http://maven.apache.org/maven-artifact-manager), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, Maven Plugin API (http://maven.apache.org/maven-plugin-api), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software, shade-maven-plugin (http://mojo.codehaus.org/shade-maven-plugin), -developed by Codehaus (http://codehaus.org) - -This product includes/uses software, Maven Wagon API (http://maven.apache.org/wagon/wagon-provider-api), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - -
