You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/05/22 09:16:01 UTC
svn commit: r659025 - in /servicemix/smx4/specs/trunk: ./ jaxb-api-2.0/
jaxb-api-2.0/src/ jaxb-api/ jaxws-api-2.0/ jaxws-api-2.0/src/
jaxws-api-2.1/ jaxws-api-2.1/src/ jaxws-api-2.1/src/main/
jaxws-api-2.1/src/main/java/ jaxws-api-2.1/src/main/java/jav...
Author: gnodet
Date: Thu May 22 00:16:01 2008
New Revision: 659025
URL: http://svn.apache.org/viewvc?rev=659025&view=rev
Log:
Add jaxws-api-2.1 jar and make rename directories to include the api version
Added:
servicemix/smx4/specs/trunk/jaxb-api-2.0/
- copied from r655606, servicemix/smx4/specs/trunk/jaxb-api/
servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml
- copied, changed from r659024, servicemix/smx4/specs/trunk/jaxb-api/pom.xml
servicemix/smx4/specs/trunk/jaxb-api-2.0/src/
- copied from r659024, servicemix/smx4/specs/trunk/jaxb-api/src/
servicemix/smx4/specs/trunk/jaxws-api-2.0/
- copied from r655606, servicemix/smx4/specs/trunk/jaxws-api/
servicemix/smx4/specs/trunk/jaxws-api-2.0/pom.xml
- copied, changed from r659024, servicemix/smx4/specs/trunk/jaxws-api/pom.xml
servicemix/smx4/specs/trunk/jaxws-api-2.0/src/
- copied from r659024, servicemix/smx4/specs/trunk/jaxws-api/src/
servicemix/smx4/specs/trunk/jaxws-api-2.1/
servicemix/smx4/specs/trunk/jaxws-api-2.1/pom.xml
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/
servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java
servicemix/smx4/specs/trunk/saaj-api-1.3/
- copied from r655606, servicemix/smx4/specs/trunk/saaj-api/
servicemix/smx4/specs/trunk/saaj-api-1.3/pom.xml
- copied, changed from r659024, servicemix/smx4/specs/trunk/saaj-api/pom.xml
servicemix/smx4/specs/trunk/saaj-api-1.3/src/
- copied from r659024, servicemix/smx4/specs/trunk/saaj-api/src/
servicemix/smx4/specs/trunk/stax-api-1.0/
- copied from r655606, servicemix/smx4/specs/trunk/stax-api/
servicemix/smx4/specs/trunk/stax-api-1.0/pom.xml
- copied, changed from r659024, servicemix/smx4/specs/trunk/stax-api/pom.xml
servicemix/smx4/specs/trunk/stax-api-1.0/src/
- copied from r659024, servicemix/smx4/specs/trunk/stax-api/src/
Removed:
servicemix/smx4/specs/trunk/jaxb-api/
servicemix/smx4/specs/trunk/jaxws-api/
servicemix/smx4/specs/trunk/saaj-api/
servicemix/smx4/specs/trunk/stax-api/
Modified:
servicemix/smx4/specs/trunk/pom.xml
Copied: servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml (from r659024, servicemix/smx4/specs/trunk/jaxb-api/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml?p2=servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml&p1=servicemix/smx4/specs/trunk/jaxb-api/pom.xml&r1=659024&r2=659025&rev=659025&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxb-api/pom.xml (original)
+++ servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml Thu May 22 00:16:01 2008
@@ -31,19 +31,20 @@
<artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
<packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Apache ServiceMix Specs :: JAXB API</name>
+ <name>Apache ServiceMix Specs :: JAXB API 2.0</name>
<dependencies>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.locator</artifactId>
- <version>${project.version}</version>
+ <version>${pom.version}</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>${geronimo.stax.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${pom.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Copied: servicemix/smx4/specs/trunk/jaxws-api-2.0/pom.xml (from r659024, servicemix/smx4/specs/trunk/jaxws-api/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxws-api-2.0/pom.xml?p2=servicemix/smx4/specs/trunk/jaxws-api-2.0/pom.xml&p1=servicemix/smx4/specs/trunk/jaxws-api/pom.xml&r1=659024&r2=659025&rev=659025&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxws-api/pom.xml (original)
+++ servicemix/smx4/specs/trunk/jaxws-api-2.0/pom.xml Thu May 22 00:16:01 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
<packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Apache ServiceMix Specs :: JAXWS API</name>
+ <name>Apache ServiceMix Specs :: JAXWS API 2.0</name>
<dependencies>
<dependency>
@@ -39,11 +39,86 @@
<artifactId>axis2-jaxws-api</artifactId>
<version>1.3</version>
<optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.locator</artifactId>
- <version>${project.version}</version>
+ <version>${pom.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
Added: servicemix/smx4/specs/trunk/jaxws-api-2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxws-api-2.1/pom.xml?rev=659025&view=auto
==============================================================================
--- servicemix/smx4/specs/trunk/jaxws-api-2.1/pom.xml (added)
+++ servicemix/smx4/specs/trunk/jaxws-api-2.1/pom.xml Thu May 22 00:16:01 2008
@@ -0,0 +1,151 @@
+<?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</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Apache ServiceMix Specs :: JAXWS API 2.1</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws-api</artifactId>
+ <version>1.4</version>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.locator</artifactId>
+ <version>${pom.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>javax.xml.ws*;version=2.0;-split-package:=merge-first</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>org.apache.servicemix.specs.locator</Private-Package>
+ <Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java?rev=659025&view=auto
==============================================================================
--- servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java (added)
+++ servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java Thu May 22 00:16:01 2008
@@ -0,0 +1,112 @@
+/**
+ * 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 javax.xml.ws.spi;
+
+import java.io.InputStream;
+import java.io.File;
+import java.io.FileInputStream;
+
+import java.util.Properties;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+import javax.xml.ws.WebServiceException;
+
+class FactoryFinder {
+ static Object locate(String factoryId) {
+ return locate(factoryId, null);
+ }
+
+ static Object locate(String factoryId, String altClassName) {
+ return locate(factoryId, altClassName, Thread.currentThread().getContextClassLoader());
+ }
+
+ static Object locate(String factoryId, String altClassName, ClassLoader classLoader) {
+ try {
+ // If we are deployed into an OSGi environment, leverage it
+ Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryId);
+ if (spiClass != null) {
+ return spiClass.newInstance();
+ }
+ } catch (Throwable e) {
+ }
+
+ String serviceId = "META-INF/services/" + factoryId;
+ try {
+ InputStream is = null;
+
+ if (classLoader == null) {
+ is = ClassLoader.getSystemResourceAsStream(serviceId);
+ } else {
+ is = classLoader.getResourceAsStream(serviceId);
+ }
+
+ if (is != null) {
+ BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ String factoryClassName = br.readLine();
+ br.close();
+
+ if (factoryClassName != null && !"".equals(factoryClassName)) {
+ return loadFactory(factoryClassName, classLoader);
+ }
+ }
+ } catch (Exception ex) {
+ }
+
+ try {
+ String configFile = System.getProperty("java.home")
+ + File.separator + "lib" + File.separator
+ + "jaxws.properties";
+ File f = new File(configFile);
+ if (f.exists()) {
+ Properties props = new Properties();
+ props.load(new FileInputStream(f));
+ String factoryClassName = props.getProperty(factoryId);
+ return loadFactory(factoryClassName, classLoader);
+ }
+ } catch (Exception e) {
+ }
+
+ try {
+ String prop = System.getProperty(factoryId);
+ if (prop != null) {
+ return loadFactory(prop, classLoader);
+ }
+ } catch (Exception e) {
+ }
+
+ if (altClassName == null) {
+ throw new WebServiceException("Unable to locate factory for " + factoryId + ".", null);
+ }
+ return loadFactory(altClassName, classLoader);
+ }
+
+ private static Object loadFactory(String className, ClassLoader classLoader) {
+ try {
+ Class factoryClass = classLoader == null ? Class.forName(className)
+ : classLoader.loadClass(className);
+ return factoryClass.newInstance();
+ } catch (ClassNotFoundException x) {
+ throw new WebServiceException("Requested factory "
+ + className + " cannot be located. Classloader ="
+ + classLoader.toString(), x);
+ } catch (Exception x) {
+ throw new WebServiceException("Requested factory "
+ + className + " could not be instantiated: " + x, x);
+ }
+ }
+}
Modified: servicemix/smx4/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/pom.xml?rev=659025&r1=659024&r2=659025&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/pom.xml (original)
+++ servicemix/smx4/specs/trunk/pom.xml Thu May 22 00:16:01 2008
@@ -36,10 +36,11 @@
<modules>
<module>locator</module>
- <module>saaj-api</module>
- <module>stax-api</module>
- <module>jaxb-api</module>
- <module>jaxws-api</module>
+ <module>saaj-api-1.3</module>
+ <module>stax-api-1.0</module>
+ <module>jaxb-api-2.0</module>
+ <module>jaxws-api-2.0</module>
+ <module>jaxws-api-2.1</module>
</modules>
<scm>
Copied: servicemix/smx4/specs/trunk/saaj-api-1.3/pom.xml (from r659024, servicemix/smx4/specs/trunk/saaj-api/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/saaj-api-1.3/pom.xml?p2=servicemix/smx4/specs/trunk/saaj-api-1.3/pom.xml&p1=servicemix/smx4/specs/trunk/saaj-api/pom.xml&r1=659024&r2=659025&rev=659025&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/saaj-api/pom.xml (original)
+++ servicemix/smx4/specs/trunk/saaj-api-1.3/pom.xml Thu May 22 00:16:01 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
<packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Apache ServiceMix Specs :: SAAJ API</name>
+ <name>Apache ServiceMix Specs :: SAAJ API 1.3</name>
<dependencies>
<dependency>
Copied: servicemix/smx4/specs/trunk/stax-api-1.0/pom.xml (from r659024, servicemix/smx4/specs/trunk/stax-api/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/stax-api-1.0/pom.xml?p2=servicemix/smx4/specs/trunk/stax-api-1.0/pom.xml&p1=servicemix/smx4/specs/trunk/stax-api/pom.xml&r1=659024&r2=659025&rev=659025&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/stax-api/pom.xml (original)
+++ servicemix/smx4/specs/trunk/stax-api-1.0/pom.xml Thu May 22 00:16:01 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Apache ServiceMix Specs :: STAX API</name>
+ <name>Apache ServiceMix Specs :: STAX API 1.0</name>
<dependencies>
<dependency>