Author: rr
Date: Fri May 28 07:48:50 2010
New Revision: 949125
URL: http://svn.apache.org/viewvc?rev=949125&view=rev
Log:
Removed e4x from distro, fixed axis2 war deps
Modified:
ode/branches/APACHE_ODE_1.3.4.X/axis2-war/src/main/assembly/bin.xml
ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/jbi.xml
ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/war.xml
Modified: ode/branches/APACHE_ODE_1.3.4.X/axis2-war/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.3.4.X/axis2-war/src/main/assembly/bin.xml?rev=949125&r1=949124&r2=949125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.3.4.X/axis2-war/src/main/assembly/bin.xml
(original)
+++ ode/branches/APACHE_ODE_1.3.4.X/axis2-war/src/main/assembly/bin.xml Fri May
28 07:48:50 2010
@@ -129,8 +129,7 @@
<include>org.apache.geronimo.modules:geronimo-kernel</include>
<include>org.apache.geronimo.components:geronimo-transaction</include>
<include>org.apache.geronimo.components:geronimo-connector</include>
- <include>org.apache.woden:woden-api</include>
- <include>org.apache.woden:woden-impl-dom</include>
+ <include>org.apache.woden:woden</include>
<include>woodstox:wstx-asl</include>
<include>org.apache.neethi:neethi</include>
<include>org.apache.ws.commons.schema:XmlSchema</include>
@@ -175,10 +174,7 @@
<dependencySet>
<outputDirectory>/WEB-INF/modules</outputDirectory>
<includes>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.rampart:rahas:mar</include>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.axis2:mex:mar</include>
+ <include>org.apache.axis2:addressing:mar</include>
</includes>
</dependencySet>
Modified: ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/jbi.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/jbi.xml?rev=949125&r1=949124&r2=949125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/jbi.xml (original)
+++ ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/jbi.xml Fri May 28
07:48:50 2010
@@ -70,47 +70,6 @@
<include>*LICENSE</include>
</includes>
</fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/e4x</directory>
- <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
- <includes>
- <include>README</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/e4x/target</directory>
- <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
- <includes>
- <include>ode-extensions-e4x*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/jms-eventpublisher</directory>
-
<outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
- <includes>
- <include>README</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/jms-eventpublisher/target</directory>
-
<outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
- <includes>
- <include>ode-extensions-jms*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions</directory>
- <outputDirectory>/extensions</outputDirectory>
- <includes>
- <include>README.extensions</include>
- </includes>
- </fileSet>
-
</fileSets>
<files>
@@ -148,23 +107,6 @@
<include>xerces:xercesImpl</include>
</includes>
</dependencySet>
-
- <dependencySet>
- <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory>
- <includes>
- <include>rhino:js</include>
- <include>commons-logging:commons-logging</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
-
<outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory>
- <includes>
- <include>org.apache.activemq:apache-activemq</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- </includes>
- </dependencySet>
-
</dependencySets>
</assembly>
Modified: ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/war.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/war.xml?rev=949125&r1=949124&r2=949125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/war.xml (original)
+++ ode/branches/APACHE_ODE_1.3.4.X/distro/src/main/assembly/war.xml Fri May 28
07:48:50 2010
@@ -67,47 +67,6 @@
<include>*LICENSE</include>
</includes>
</fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/e4x</directory>
- <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
- <includes>
- <include>README</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/e4x/target</directory>
- <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
- <includes>
- <include>ode-extensions-e4x*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/jms-eventpublisher</directory>
-
<outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
- <includes>
- <include>README</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/jms-eventpublisher/target</directory>
-
<outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
- <includes>
- <include>ode-extensions-jms*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions</directory>
- <outputDirectory>/extensions</outputDirectory>
- <includes>
- <include>README.extensions</include>
- </includes>
- </fileSet>
-
</fileSets>
<files>
@@ -146,23 +105,6 @@
<include>xerces:xercesImpl</include>
</includes>
</dependencySet>
-
- <dependencySet>
- <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory>
- <includes>
- <include>rhino:js</include>
- <include>commons-logging:commons-logging</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
-
<outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory>
- <includes>
- <include>org.apache.activemq:apache-activemq</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- </includes>
- </dependencySet>
-
</dependencySets>
</assembly>
