Modified: trunk/assembly/project.xml (823 => 824)
--- trunk/assembly/project.xml 2005-11-13 23:04:00 UTC (rev 823)
+++ trunk/assembly/project.xml 2005-11-13 23:05:55 UTC (rev 824)
@@ -374,9 +374,17 @@
</properties>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${jasper_version}</version>
+ <properties>
+ <optional>true</optional>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>${jasper_compiler_version}</version>
+ <version>${jasper_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -384,7 +392,7 @@
<dependency>
<groupId>jetty</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>${jasper_runtime_version}</version>
+ <version>${jasper_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -625,7 +633,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jsr181-api</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -633,7 +641,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxws-api</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -641,7 +649,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxb-api</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -649,7 +657,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -657,7 +665,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -665,7 +673,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-api</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -673,7 +681,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-impl</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -681,7 +689,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jsr181-api</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -689,7 +697,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jsr250-api</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -697,7 +705,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -705,7 +713,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>http</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
@@ -713,7 +721,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>sjsxp</artifactId>
- <version>20051026</version>
+ <version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
</properties>
Modified: trunk/core/project.xml (823 => 824)
--- trunk/core/project.xml 2005-11-13 23:04:00 UTC (rev 823)
+++ trunk/core/project.xml 2005-11-13 23:05:55 UTC (rev 824)
@@ -21,28 +21,16 @@
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>${mx4j_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>false</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>${mx4j_remote_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>${mx4j_tools_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>false</war.bundle>
- </properties>
</dependency>
<!--For remote management tasks-->
@@ -50,9 +38,6 @@
<dependency>
<id>ant</id>
<version>${ant_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
@@ -60,10 +45,6 @@
<artifactId>commons-logging</artifactId>
<version>${commons_logging_version}</version>
<url>http://jakarta.apache.org/commons/logging/</url>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
@@ -75,37 +56,21 @@
<dependency>
<id>concurrent</id>
<version>${concurrent_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<id>backport-util-concurrent</id>
<version>${backport_util_concurrent_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<id>wsdl4j</id>
<version>${wsdl4j_version}</version>
- <properties>
- <optional>true</optional>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<id>commons-beanutils</id>
<version>${commons_beanutils_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
@@ -134,9 +99,6 @@
<groupId>servicemix</groupId>
<artifactId>jaxp</artifactId>
<version>1.3</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<!--
@@ -156,19 +118,11 @@
<dependency>
<id>stax+api</id>
<version>${stax_api_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<id>jaxen</id>
<version>${jaxen_version}</version>
- <properties>
- <optional>true</optional>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- possible StAX implementations: START -->
@@ -178,10 +132,6 @@
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>${woodstox_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
@@ -202,36 +152,23 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xercesImpl_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>${xerces_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml_apis_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<!-- mostly included for some DOM/SAX tools we could maybe replace with JAXP versions -->
<dependency>
<id>xalan</id>
<version>${xalan_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
@@ -240,10 +177,6 @@
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
@@ -251,9 +184,6 @@
<dependency>
<id>stax-utils</id>
<version>${stax_utils_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
@@ -261,52 +191,28 @@
<dependency>
<id>geronimo-spec+jms</id>
<version>${geronimo_spec_jms_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<id>geronimo-spec+servlet</id>
<version>${geronimo_spec_servlet_version}</version>
- <properties>
- <war.bundle>false</war.bundle>
- <lib>false</lib>
- </properties>
</dependency>
<dependency>
<id>geronimo-spec+jta</id>
<version>${geronimo_spec_jta_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<id>geronimo-spec+j2ee-management</id>
<version>${geronimo_spec_j2ee_management_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
- <properties>
- <rar.bundle>false</rar.bundle>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-activation</artifactId>
<version>${geronimo_spec_activation_version}</version>
- <properties>
- <rar.bundle>false</rar.bundle>
- <lib>true</lib>
- </properties>
</dependency>
@@ -316,9 +222,6 @@
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>annogen</groupId>
@@ -335,10 +238,6 @@
<dependency>
<id>jencks+all</id>
<version>${jencks_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
@@ -364,23 +263,14 @@
<dependency>
<id>activemq+core</id>
<version>4.0-SNAPSHOT</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<id>activemq+ra</id>
<version>4.0-SNAPSHOT</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<id>activeio</id>
<version>2.0-SNAPSHOT</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
-->
@@ -388,28 +278,16 @@
<dependency>
<id>activemq</id>
<version>${activemq_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<id>activemq+ra</id>
<version>${activemq_version}</version>
- <properties>
- <lib>true</lib>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- For clustering services -->
<dependency>
<id>activecluster</id>
<version>${activecluster_version}</version>
- <properties>
- <optional>true</optional>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
@@ -418,9 +296,6 @@
<dependency>
<id>xstream</id>
<version>${xstream_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
</dependency>
<!--
@@ -432,17 +307,11 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons_collections_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${commons_pool_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
</dependency>
<!-- optional used for in-web container testing -->
@@ -450,25 +319,21 @@
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
<version>${org.mortbay.jetty_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>${jasper_compiler_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
+ <version>${jasper_version}</version>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>${jasper_runtime_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
+ <version>${jasper_version}</version>
</dependency>
@@ -478,19 +343,11 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${commons_dbcp_version}</version>
- <properties>
- <optional>true</optional>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby_version}</version>
- <properties>
- <optional>true</optional>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- JNDI provider for binary release -->
@@ -498,9 +355,6 @@
<groupId>simple-jndi</groupId>
<artifactId>simple-jndi</artifactId>
<version>${simple_jndi_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
</dependency>
<!-- for unit test cases -->
@@ -513,57 +367,36 @@
<dependency>
<id>hsqldb</id>
<version>${hsqldb_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
</dependency>
<dependency>
<id>axion</id>
<version>${axion_version}</version>
- <properties>
- <optional>false</optional>
- </properties>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
<version>${commons_primitives_version}</version>
- <properties>
- <optional>false</optional>
- </properties>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>DdlUtils</artifactId>
<version>1.0-dev</version>
- <properties>
- <optional>false</optional>
- </properties>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons_lang_version}</version>
- <properties>
- <optional>false</optional>
- </properties>
</dependency>
<dependency>
<groupId>commons-betwixt</groupId>
<artifactId>commons-betwixt</artifactId>
<version>${commons_betwixt_version}</version>
- <properties>
- <optional>false</optional>
- </properties>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${commons_digester_version}</version>
- <properties>
- <optional>false</optional>
- </properties>
</dependency>
