Permalink
Browse files

[SWITCHYARD-649] - Remove TODO in BPEL assembly

  • Loading branch information...
1 parent 58a4112 commit fcf43590c911d083796157cffecf6f91ff545a68 @mageshbk committed Feb 17, 2012
@@ -433,10 +433,6 @@
<artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
- <dependency>
<groupId>net.sourceforge.saxon</groupId>
<artifactId>saxonhe</artifactId>
</dependency>
@@ -38,11 +38,6 @@
<filtered>true</filtered>
</file>
<file>
- <source>src/main/resources/external/jaxen/module.xml</source>
- <outputDirectory>/modules/org/jaxen/main</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
<source>src/main/resources/external/drools/knowledge-api/module.xml</source>
<destName>module.xml</destName>
<outputDirectory>/modules/org/drools/knowledge-api/main</outputDirectory>
@@ -135,6 +130,11 @@
<source>src/main/resources/external/fusesource/commonman/module.xml</source>
<outputDirectory>/modules/org/fusesource/commonman/main</outputDirectory>
<filtered>true</filtered>
+ </file>
+ <file>
+ <source>src/main/resources/external/saxon/module.xml</source>
+ <outputDirectory>/modules/net/sourceforge/saxon/main</outputDirectory>
+ <filtered>true</filtered>
</file>
<file>
<source>src/main/resources/external/springframework/module.xml</source>
@@ -187,14 +187,6 @@
<dependencySet>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
- <include>jaxen:jaxen</include>
- </includes>
- <outputDirectory>/modules/org/jaxen/main</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${version.jaxen}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- <dependencySet>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
<include>org.drools:knowledge-api</include>
</includes>
<outputDirectory>/modules/org/drools/knowledge-api/main</outputDirectory>
@@ -342,6 +334,14 @@
<outputFileNameMapping>${artifact.artifactId}-${version.camel}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>net.sourceforge.saxon:saxonhe</include>
+ </includes>
+ <outputDirectory>/modules/net/sourceforge/saxon/main</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${version.saxon}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>org.springframework:spring-core</include>
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.jaxen">
-
- <resources>
- <resource-root path="jaxen-${version.jaxen}.jar"/>
- </resources>
-
- <dependencies>
- </dependencies>
-</module>
@@ -29,6 +29,8 @@
</resources>
<dependencies>
+ <module name="javax.api"/>
+ <module name="org.jaxen"/>
</dependencies>
</module>
@@ -27,14 +27,6 @@
<outputDirectory>/modules/org/switchyard/component/bpel/main</outputDirectory>
<filtered>true</filtered>
</file>
- <!-- (See module.xml)
- <file>
- <source>src/main/resources/switchyard/components/bpel/resources/net/sourceforge/saxon/module.xml</source>
- <source>src/main/resources/switchyard/components/bpel/resources/net/sourceforge/saxon/module.xml</source>
- <outputDirectory>/modules/net/sourceforge/saxon/main</outputDirectory>
- <filtered>true</filtered>
- </file>
- -->
</files>
<dependencySets>
<dependencySet>
@@ -199,16 +191,6 @@
<outputFileNameMapping>${artifact.artifactId}-${version.activity.monitor.model}.${artifact.extension}
</outputFileNameMapping>
</dependencySet>
-
- <dependencySet>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <include>jaxen:jaxen</include>
- </includes>
- <outputDirectory>/modules/org/switchyard/component/bpel/main</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-1.1.1.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
<dependencySet>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
@@ -219,26 +201,6 @@
</outputFileNameMapping>
</dependencySet>
- <dependencySet>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <include>net.sourceforge.saxon:saxonhe</include>
- </includes>
- <outputDirectory>/modules/org/switchyard/component/bpel/main</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${version.saxon}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- (See module.xml)
- <dependencySet>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <include>net.sourceforge.saxon:saxonhe</include>
- </includes>
- <outputDirectory>/modules/net/sourceforge/saxon/main</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${version.saxon}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- -->
-
</dependencySets>
</assembly>
@@ -43,19 +43,6 @@
<!-- Keep this as a local dependency, as it is an older version that ODE requires -->
<resource-root path="xmlbeans-${version.xmlbeans}.jar"/>
-
- <!-- TODO: Tried to use 'org.jaxen' module, but got:
- java.lang.ClassNotFoundException: org.w3c.dom.Node from [Module "org.jaxen:main" from local module loader
- when running an example. org.w3c.dom.Node is part of the jvm rt.jar, so not sure why
- it can't find this class.
- -->
- <resource-root path="jaxen-1.1.1.jar"/>
-
- <!-- TODO: Tried to create separate module, but got:
- java.lang.ClassNotFoundException: javax.xml.transform.sax.SAXTransformerFactory from [Module "net.sourceforge.saxon:main"
- -->
- <resource-root path="saxonhe-9.2.1.5.jar"/>
-
</resources>
<dependencies>
@@ -89,10 +76,8 @@
<module name="com.h2database.h2"/>
- <!--
<module name="org.jaxen"/>
- <module name="net.sourceforge.saxon"/>
- -->
+ <module name="net.sourceforge.saxon" services="import" export="false"/>
</dependencies>
</module>

0 comments on commit fcf4359

Please sign in to comment.