Author: veithen
Date: Mon Nov 29 21:55:46 2010
New Revision: 1040313
URL: http://svn.apache.org/viewvc?rev=1040313&view=rev
Log:
Fix for AXIS2-4901. There was a bad interaction between the embedded xercesImpl
and xmlbeans dependencies. This change only applies to the 1.5 branch because
on the trunk, xercesImpl is no longer required (because Woden no longer depends
on Xerces implementation classes).
Modified:
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
Modified:
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1040313&r1=1040312&r2=1040313&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
Mon Nov 29 21:55:46 2010
@@ -188,8 +188,11 @@
<Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|wstx-asl|geronimo-activation_1.1_spec|geronimo-javamail_1.4_spec|geronimo-stax-api_1.0_spec|ant*</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
- <!-- Exclude imports that are actually not used -->
-
<Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,*</Import-Package>
+ <!-- Exclude imports that are actually not used. Also
import org.w3c.dom explicitly. This is necessary
+ because the xmlbeans JAR contains a couple of
classes from that package and therefore the bundle
+ plugin believes that the entire package is
provided by that JAR. This results in a LinkageError
+ when Xerces is used. See AXIS2-4901. -->
+
<Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,*,org.w3c.dom</Import-Package>
<Export-Package />
<Bundle-Name>Axis2 Codegen Wizard Plug-in</Bundle-Name>
<Bundle-Activator>org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin</Bundle-Activator>
Modified:
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1040313&r1=1040312&r2=1040313&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
Mon Nov 29 21:55:46 2010
@@ -165,8 +165,11 @@
<Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|wstx-asl|geronimo-activation_1.1_spec|geronimo-javamail_1.4_spec|geronimo-stax-api_1.0_spec|ant*</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
- <!-- Exclude imports that are actually not used -->
-
<Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!org.apache.commons.io*,!sun.*,*</Import-Package>
+ <!-- Exclude imports that are actually not used. Also
import org.w3c.dom explicitly. This is necessary
+ because the xmlbeans JAR contains a couple of
classes from that package and therefore the bundle
+ plugin believes that the entire package is
provided by that JAR. This results in a LinkageError
+ when Xerces is used. See AXIS2-4901. -->
+
<Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!org.apache.commons.io*,!sun.*,*,org.w3c.dom</Import-Package>
<Export-Package />
<Bundle-Name>Axis2 Service Maker</Bundle-Name>
<Bundle-Activator>org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver</Bundle-Activator>
