Author: dkulp
Date: Mon Jun 15 17:53:30 2009
New Revision: 784886
URL: http://svn.apache.org/viewvc?rev=784886&view=rev
Log:
Remove OSGi related stuff as it won't work anyway. Let SMX handle it later.
Modified:
cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml?rev=784886&r1=784885&r2=784886&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml Mon Jun 15 17:53:30 2009
@@ -32,7 +32,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Geronimo JAX-WS 2.2 API</name>
<version>1.0.0-alpha-SNAPSHOT</version>
<description>Java API for XML Web Services 2.2</description>
@@ -99,20 +99,5 @@
</dependency-->
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>javax.xml.ws*;version=2.2;-split-package:=merge-first</Export-Package>
-
<DynamicImport-Package>org.apache.servicemix.specs.locator.*</DynamicImport-Package>
- <Import-Package>*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java?rev=784886&r1=784885&r2=784886&view=diff
==============================================================================
---
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
(original)
+++
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
Mon Jun 15 17:53:30 2009
@@ -168,18 +168,6 @@
debugPrintln("debug is on");
ClassLoader classLoader = findClassLoader();
-
- try {
- //If we are deployed into an OSGi environment,
leverage it
- Class<?> cls =
Class.forName("org.apache.servicemix.specs.locator.OsgiLocator");
- Method m = cls.getMethod("locate", new Class[]
{String.class});
- Class<?> spiClass = (Class)m.invoke(null, iFactoryId);
- if (spiClass != null) {
- return spiClass.newInstance();
- }
- } catch (Throwable e) {
- //ignore
- }
// Use the system property first
try {
