servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [servicemix-specs] branch master updated: [SM-3925]create saaj api 1.4 spec bundle
Date Tue, 15 Jan 2019 06:27:06 GMT
This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-specs.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a9670f  [SM-3925]create saaj api 1.4 spec bundle
     new b4dadce  Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/servicemix-specs
5a9670f is described below

commit 5a9670f5f1a7a76140bffb60231b0b933d9fad14
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Tue Jan 15 14:26:12 2019 +0800

    [SM-3925]create saaj api 1.4 spec bundle
---
 saaj-api-1.4/pom.xml                               | 177 ++++++++++++
 .../main/java/javax/xml/soap/FactoryFinder.java    | 307 +++++++++++++++++++++
 2 files changed, 484 insertions(+)

diff --git a/saaj-api-1.4/pom.xml b/saaj-api-1.4/pom.xml
new file mode 100644
index 0000000..817f671
--- /dev/null
+++ b/saaj-api-1.4/pom.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>specs-pom</artifactId>
+        <version>2-SNAPSHOT</version>
+        <relativePath>../specs-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.specs</groupId>
+    <artifactId>org.apache.servicemix.specs.saaj-api-1.4</artifactId>
+    <packaging>bundle</packaging>
+    <version>1.4_1-SNAPSHOT</version>
+    <name>Apache ServiceMix :: Specs :: SAAJ API 1.4</name>
+
+    <scm>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-specs.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-specs.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-specs.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.soap</groupId>
+            <artifactId>jakarta.xml.soap-api</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.locator</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Description>${project.description}</Bundle-Description>
+                        <Export-Package>javax.xml.soap*;version=1.4;-split-package:=merge-first;-noimport:=true</Export-Package>
+                        <Import-Package>*</Import-Package>
+                        <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
+                        <Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
+                        <Implementation-Title>Apache ServiceMix</Implementation-Title>
+                        <Implementation-Version>${project.version}</Implementation-Version>
+                    </instructions>
+                    <unpackBundle>true</unpackBundle>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>javax.xml.soap:javax.xml.soap-api</include>
+                                    <include>org.apache.servicemix.specs:org.apache.servicemix.specs.locator</include>
+                                    <include>${project.groupId}:${project.artifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>javax.xml.soap:javax.xml.soap-api</artifact>
+                                    <excludes>
+                                        <exclude>javax/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.servicemix.specs:org.apache.servicemix.specs.locator</artifact>
+                                    <excludes>
+                                        <exclude>org/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <createSourcesJar>${createSourcesJar}</createSourcesJar>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>deploy</id>
+            <properties>
+                <createSourcesJar>true</createSourcesJar>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack-sources</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>javax.xml.soap</groupId>
+                                            <artifactId>javax.xml.soap-api</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.apache.servicemix.specs</groupId>
+                                            <artifactId>org.apache.servicemix.specs.locator</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                    </artifactItems>
+                                    <outputDirectory>${project.build.directory}/sources</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <minmemory>128m</minmemory>
+                            <maxmemory>512m</maxmemory>
+                            <sourcepath>${project.build.directory}/sources</sourcepath>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/saaj-api-1.4/src/main/java/javax/xml/soap/FactoryFinder.java b/saaj-api-1.4/src/main/java/javax/xml/soap/FactoryFinder.java
new file mode 100644
index 0000000..ba56edf
--- /dev/null
+++ b/saaj-api-1.4/src/main/java/javax/xml/soap/FactoryFinder.java
@@ -0,0 +1,307 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2004-2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package javax.xml.soap;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+class FactoryFinder {
+
+    private static final Logger logger = Logger.getLogger("javax.xml.soap");
+
+    private static final ServiceLoaderUtil.ExceptionHandler<SOAPException> EXCEPTION_HANDLER
=
+            new ServiceLoaderUtil.ExceptionHandler<SOAPException>() {
+                @Override
+                public SOAPException createException(Throwable throwable, String message)
{
+                    return new SOAPException(message, throwable);
+                }
+            };
+
+    /**
+     * Finds the implementation {@code Class} object for the given
+     * factory type.  If it fails and {@code tryFallback} is {@code true}
+     * finds the {@code Class} object for the given default class name.
+     * The arguments supplied must be used in order
+     * Note the default class name may be needed even if fallback
+     * is not to be attempted in order to check if requested type is fallback.
+     * <P>
+     * This method is package private so that this code can be shared.
+     *
+     * @return the {@code Class} object of the specified message factory;
+     *         may not be {@code null}
+     *
+     * @param factoryClass          factory abstract class or interface to be found
+     * @param deprecatedFactoryId   deprecated name of a factory; it is used for types
+     *                              where class name is different from a name
+     *                              being searched (in previous spec).
+     * @param defaultClassName      the implementation class name, which is
+     *                              to be used only if nothing else
+     *                              is found; {@code null} to indicate
+     *                              that there is no default class name
+     * @param tryFallback           whether to try the default class as a
+     *                              fallback
+     * @exception SOAPException if there is a SOAP error
+     */
+    @SuppressWarnings("unchecked")
+    static <T> T find(Class<T> factoryClass,
+                      String defaultClassName,
+                      boolean tryFallback, String deprecatedFactoryId) throws SOAPException
{
+
+        ClassLoader tccl = ServiceLoaderUtil.contextClassLoader(EXCEPTION_HANDLER);
+        String factoryId = factoryClass.getName();
+
+        try {
+            // If we are deployed into an OSGi environment, leverage it
+            if (factoryClass == null) {
+                String factoryClassName = factoryClass.getName();
+                if (factoryClassName.equals("javax.xml.soap.MetaFactory")) {
+                    //this is an exception that the factoryPropertyName isn't
+                    //the actual factory class name, there is no class
+                    //javax.xml.soap.MetaFactory at all
+                    factoryClassName = "javax.xml.soap.SAAJMetaFactory";
+                }
+                ClassLoader cl = FactoryFinder.class.getClassLoader();
+                if (cl == null) {
+                    cl = Thread.currentThread().getContextClassLoader();
+                }
+                factoryClass = (Class<T>)cl.loadClass(factoryClassName);
+            }
+            Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryClass,
factoryClass.getName());
+            if (spiClass != null) {
+                return (T)spiClass.newInstance();
+            }
+        } catch (Throwable e) {
+        }
+
+
+        // Use the system property first
+        String className = fromSystemProperty(factoryId, deprecatedFactoryId);
+        if (className != null) {
+            Object result = newInstance(className, defaultClassName, tccl);
+            if (result != null) {
+                return (T) result;
+            }
+        }
+
+        // try to read from $java.home/lib/jaxm.properties
+        className = fromJDKProperties(factoryId, deprecatedFactoryId);
+        if (className != null) {
+            Object result = newInstance(className, defaultClassName, tccl);
+            if (result != null) {
+                return (T) result;
+            }
+        }
+
+        // standard services: java.util.ServiceLoader
+        T factory = ServiceLoaderUtil.firstByServiceLoader(
+                factoryClass,
+                logger,
+                EXCEPTION_HANDLER);
+        if (factory != null) {
+            return factory;
+        }
+
+        // try to find services in CLASSPATH
+        className = fromMetaInfServices(deprecatedFactoryId, tccl);
+        if (className != null) {
+            logger.log(Level.WARNING,
+                    "Using deprecated META-INF/services mechanism with non-standard property:
{0}. " +
+                            "Property {1} should be used instead.",
+                    new Object[]{deprecatedFactoryId, factoryId});
+            Object result = newInstance(className, defaultClassName, tccl);
+            if (result != null) {
+                return (T) result;
+            }
+        }
+
+        // If not found and fallback should not be tried, return a null result.
+        if (!tryFallback)
+            return null;
+
+        // We didn't find the class through the usual means so try the default
+        // (built in) factory if specified.
+        if (defaultClassName == null) {
+            throw new SOAPException(
+                    "Provider for " + factoryId + " cannot be found", null);
+        }
+        return (T) newInstance(defaultClassName, defaultClassName, tccl);
+    }
+
+    // in most cases there is no deprecated factory id
+    static <T> T find(Class<T> factoryClass,
+                      String defaultClassName,
+                      boolean tryFallback) throws SOAPException {
+        return find(factoryClass, defaultClassName, tryFallback, null);
+    }
+
+    private static Object newInstance(String className, String defaultClassName, ClassLoader
tccl) throws SOAPException {
+        return ServiceLoaderUtil.newInstance(
+                className,
+                defaultClassName,
+                tccl,
+                EXCEPTION_HANDLER);
+    }
+
+    // used only for deprecatedFactoryId;
+    // proper factoryId searched by java.util.ServiceLoader
+    private static String fromMetaInfServices(String deprecatedFactoryId, ClassLoader tccl)
{
+        String serviceId = "META-INF/services/" + deprecatedFactoryId;
+        logger.log(Level.FINE, "Checking deprecated {0} resource", serviceId);
+
+        try (InputStream is =
+                     tccl == null ?
+                             ClassLoader.getSystemResourceAsStream(serviceId)
+                             :
+                             tccl.getResourceAsStream(serviceId)) {
+
+            if (is != null) {
+                String factoryClassName;
+                try (InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
+                     BufferedReader rd = new BufferedReader(isr)) {
+                    factoryClassName = rd.readLine();
+                }
+
+                logFound(factoryClassName);
+                if (factoryClassName != null && !"".equals(factoryClassName)) {
+                    return factoryClassName;
+                }
+            }
+
+        } catch (IOException e) {
+            // keep original behavior
+        }
+        return null;
+    }
+
+    private static String fromJDKProperties(String factoryId, String deprecatedFactoryId)
{
+        Path path = null;
+        try {
+            String JAVA_HOME = getSystemProperty("java.home");
+            path = Paths.get(JAVA_HOME, "conf", "jaxm.properties");
+            logger.log(Level.FINE, "Checking configuration in {0}", path);
+
+            // to ensure backwards compatibility
+            if (!Files.exists(path)) {
+                path = Paths.get(JAVA_HOME, "lib", "jaxm.properties");
+            }
+
+            logger.log(Level.FINE, "Checking configuration in {0}", path);
+            if (Files.exists(path)) {
+                Properties props = new Properties();
+                try (InputStream inputStream = Files.newInputStream(path)) {
+                    props.load(inputStream);
+                }
+
+                // standard property
+                logger.log(Level.FINE, "Checking property {0}", factoryId);
+                String factoryClassName = props.getProperty(factoryId);
+                logFound(factoryClassName);
+                if (factoryClassName != null) {
+                    return factoryClassName;
+                }
+
+                // deprecated property
+                if (deprecatedFactoryId != null) {
+                    logger.log(Level.FINE, "Checking deprecated property {0}", deprecatedFactoryId);
+                    factoryClassName = props.getProperty(deprecatedFactoryId);
+                    logFound(factoryClassName);
+                    if (factoryClassName != null) {
+                        logger.log(Level.WARNING,
+                                "Using non-standard property: {0}. Property {1} should be
used instead.",
+                                new Object[]{deprecatedFactoryId, factoryId});
+                        return factoryClassName;
+                    }
+                }
+            }
+        } catch (Exception ignored) {
+            logger.log(Level.SEVERE, "Error reading SAAJ configuration from ["  + path +
+                    "] file. Check it is accessible and has correct format.", ignored);
+        }
+        return null;
+    }
+
+    private static String fromSystemProperty(String factoryId, String deprecatedFactoryId)
{
+        String systemProp = getSystemProperty(factoryId);
+        if (systemProp != null) {
+            return systemProp;
+        }
+        if (deprecatedFactoryId != null) {
+            systemProp = getSystemProperty(deprecatedFactoryId);
+            if (systemProp != null) {
+                logger.log(Level.WARNING,
+                        "Using non-standard property: {0}. Property {1} should be used instead.",
+                        new Object[] {deprecatedFactoryId, factoryId});
+                return systemProp;
+            }
+        }
+        return null;
+    }
+
+    private static String getSystemProperty(final String property) {
+        logger.log(Level.FINE, "Checking system property {0}", property);
+        String value = AccessController.doPrivileged(new PrivilegedAction<String>()
{
+            @Override
+            public String run() {
+                return System.getProperty(property);
+            }
+        });
+        logFound(value);
+        return value;
+    }
+
+    private static void logFound(String value) {
+        if (value != null) {
+            logger.log(Level.FINE, "  found {0}", value);
+        } else {
+            logger.log(Level.FINE, "  not found");
+        }
+    }
+
+}


Mime
View raw message