Diff
Modified: trunk/assembly/project.xml (1049 => 1050)
--- trunk/assembly/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/assembly/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -629,7 +629,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>ojdbc14</artifactId>
- <jar>ojdbc14.jar</jar>
+ <jar>${oracle_ojdbc14_jar}</jar>
<properties>
<optional>true</optional>
</properties>
@@ -637,7 +637,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>oraclexsql</artifactId>
- <jar>oraclexsql.jar</jar>
+ <jar>${oracle_oraclexsql_jar}</jar>
<properties>
<optional>true</optional>
</properties>
@@ -645,7 +645,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>xmlparserv2</artifactId>
- <jar>xmlparserv2.jar</jar>
+ <jar>${oracle_xmlparserv2_jar}</jar>
<properties>
<optional>true</optional>
</properties>
@@ -653,7 +653,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>xsu12</artifactId>
- <jar>xsu12.jar</jar>
+ <jar>${oracle_xsu12_jar}</jar>
<properties>
<optional>true</optional>
</properties>
Modified: trunk/etc/project.properties (1049 => 1050)
--- trunk/etc/project.properties 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/etc/project.properties 2005-12-08 17:00:35 UTC (rev 1050)
@@ -68,26 +68,42 @@
# dependency versions
# -------------------------------------------------------------------
+# http://activecluster.codehaus.org/, ASL 2
activecluster_version=1.1-SNAPSHOT
+# http://activeio.codehaus.org/, part of AMQ, ASL 2
activeio_version=2.1
+# http://activemq.codehaus.org/, ASL 2
activemq_version=3.2.1
+# http://activesoap.codehaus.org/, ASL 2
activesoap_version=1.0-SNAPSHOT
+# http://annogen.codehaus.org/, ASL 2
annogen_version=0.1.0
+# http://ant.apache.org/, ASL 2
ant_version=1.6
+# http://www.antlr.org/license.html (used in Geronimo)
antlr_version=2.7.5
+# http://directory.apache.org/subprojects/apacheds/, ASL 2
apacheds_version=0.9.2
+# (used in Geronimo)
asn1_version=0.3.2
+# http://incubator.apache.org/projects/axion.html
axion_version=1.0-M3-dev
+# http://ws.apache.org/axis/, ASL 2
axis_version=1.3
+# http://backport175.codehaus.org/, ASL 2
backport175_version=1.0.RC1
+# http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/, public domain
backport_util_concurrent_version=2.0_01_pd
+# http://beehive.apache.org/, ASL 2
beehive_wsm_version=1.0-alpha
-berkeleydb_version=1.5.1
-berkeleydb_native_version=4.2
+# http://castor.codehaus.org/, ASL 2 (> 0.9.7, see http://castor.codehaus.org/license.html) (used in Geronimo)
castor_version = 0.9.5.3
+# http://cglib.sourceforge.net/, ASL 2
cglib_version=2.1_3
cglib_full_version=2.0
+# http://classworlds.codehaus.org/, http://classworlds.codehaus.org/license.html
classworlds_version = 1.0.1
+# http://jakarta.apache.org/commons/, ASL 2
commons_attributes_version=2.1
commons_beanutils_version=1.7.0
commons_betwixt_version=0.7
@@ -100,21 +116,30 @@
commons_httpclient_version=3.0-rc2
commons_io_version=1.0
commons_jelly_tags_velocity_version=SNAPSHOT
+commons_jelly_tags_xml_version=1.1
+commons_jelly_tags_util_version=1.1.1
+commons_jelly_tags_interaction_version=1.0
commons_lang_version=2.0
commons_logging_version=1.0.4
commons_net_version=1.4.0
commons_pool_version=1.2
commons_primitives_version=1.0
commons_vfs_version=20050307052300
+# http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html, public domain (used in Geronimo)
concurrent_version=1.3.4
+# http://db.apache.org/ddlutils/, ASL 2
ddlutils_version=1.0-dev
+# http://db.apache.org/derby/, ASL 2
derby_version=10.1.1.0
derbynet_version=10.1.1.0
+# http://drools.org/, http://drools.org/The+License
drools_core_version=2.1
drools_version=2.1
+# http://howl.objectweb.org/, http://howl.objectweb.org/license.html (used in Geronimo)
howl_logger_version=0.1.8
+# http://www.easymock.org/, http://www.easymock.org/License.html, MIT
easymock_version=1.2_Java1.3
-emberio_version=0.3-alpha
+# http://geronimo.apache.org/, ASL 2
geronimo_kernel_version=1.0-SNAPSHOT
geronimo_system_version=1.0-SNAPSHOT
geronimo_remoting_version=1.0-SNAPSHOT
@@ -140,74 +165,110 @@
geronimo_spec_servlet_version=2.4-rc4
geronimo_transaction_version=1.0-SNAPSHOT
geronimo_version=1.0-SNAPSHOT
+# http://groovy.codehaus.org/, http://groovy.codehaus.org/license.html
groovy_version=1.0-jsr-03
+# http://httpunit.sourceforge.net/, http://httpunit.sourceforge.net/doc/license.html
httpunit_version=1.6
+# http://hsqldb.org/, http://hsqldb.org/web/hsqlLicense.html (used in Geronimo)
hsqldb_version=1.7.3.3
+# http://www.janino.net/, http://www.janino.net/javadoc/org/codehaus/janino/doc-files/new_bsd_license.txt
janino_version=2.3.2
+# (used in Geronimo)
jasper_version = 5.5.9
-javacc_version=2.1
+# ?
+jaxb_version=20051114
+# http://jaxen.org/, http://jaxen.org/license.html
jaxen_version=1.1-beta-8
+# SM build
jaxp_version=1.3
+# https://jax-ws-sources.dev.java.net/, CDDL
jaxws_rt_version=20051127
-jdbm_version=0.20-dev
+# http://www.jdom.org/, ASL style (used in Geronimo)
jdom_version=1.0
+# http://jencks.org/, ASL 2
jencks_version=1.1.2
-jgroups_version=2.2.5
-jmdns_version=1.0-RC2
-jmock_version=1.0.1
-jmock_cglib_version=1.0.1
+# http://www.jcp.org/en/jsr/detail?id=223
jsr_223_version=1.0-pr
+# http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html, ASL 2
jstl_version = 1.1.1
-jrms_version=1.1
+# http://www.junit.org/, CPL (used everywhere)
junit_version=3.8.1
-jxta_version=2.0
-kerberos_common_version=0.5
-kerberos_protocols_version=0.5
-ldap_protocols_version=0.9.2
+# http://lingo.codehaus.org/, ASL 2
lingo_version=1.1
+# http://logging.apache.org/log4j/docs/, ASL 2
log4j_version=1.2.12
+# http://lucene.apache.org/java/, ASL 2
lucene_version=1.4.3
-maven_itest_plugin_version=1.0
-mina_version=0.7.3
+# http://mule.codehaus.org/, http://mule.codehaus.org/License
mule_version=1.0
+# http://mx4j.sourceforge.net/, (Used in Geronimo)
mx4j_version=2.1.1
mx4j_remote_version=2.1.1
mx4j_tools_version=2.1.1
+# oracle
+oracle_ojdbc14_jar=ojdbc14.jar
+oracle_oraclexsql_jar=oraclexsql.jar
+oracle_xmlparserv2_jar=xmlparserv2.jar
+oracle_xsu12_jar=xsu12.jar
+# http://openejb.codehaus.org/, (Used in Geronimo)
openejb_core_version=2.0-SNAPSHOT
+# http://jetty.mortbay.org/, ASL 2
org.mortbay.jetty_version=5.1.6
+# http://jakarta.apache.org/oro/, ASL 2
oro_version=2.0.8
-p2psockets_core_version=1.1.2
+# http://portals.apache.org/pluto/, ASL 2
pluto_version = 1.0.1
+# (Used in Pluto)
portlet_api_version = 1.0
+# http://qdox.codehaus.org/, http://qdox.codehaus.org/license.html, ASL style
qdox_version=1.5
+# http://www.opensymphony.com/quartz/, ASL 2
quartz_version=1.4.5
+# http://jakarta.apache.org/regexp/, ASL 2
regexp_version=1.3
+# https://rome.dev.java.net/, ASL 2
rome_version=0.5
+# ?
+saaj_version=20050915
+# http://www.osjava.org/simple-jndi/, http://www.osjava.org/simple-jndi/license.html
simple_jndi_version=0.11.1
-slf4j_version=1.0-beta7
+# ?
+smack_version=1.5.0
+# http://www.springframework.org/, ASL 2
spring_version=1.2.5
+# http://jakarta.apache.org/taglibs/, ASL 2
standard_taglibs_version = 1.1.1
+# ?
stax_api_version=1.0
+# https://stax-utils.dev.java.net/, BSD license
stax_utils_version=snapshot-20040917
-tomcat_version=5.0.28
-velocity_version=1.4-rc1
+# http://woodstox.codehaus.org/, ?
woodstox_version=2.0.3
+# http://sourceforge.net/projects/wsdl4j, CPL (Used in Geronimo)
wsdl4j_version=1.5.1
+# http://ws.apache.org/wsif/, ASL 2
wsif_version=2.0.1_IB3
+# http://xml.apache.org/xalan-j/, ASL 2
xalan_version=2.7.0
+# http://xerces.apache.org/xerces-j/, ASL 2
xerces_version=2.6.2
xercesImpl_version=2.7.1
+# http://www.xbean.org/, ASL 2
xbean_version=2.1-SNAPSHOT
+# http://xfire.codehaus.org/, http://xfire.codehaus.org/License
xfire_version=1.0-20051129.225317
xfire_jaxws_version=1.0-20051130.145319
#xfire_version=1.0-SNAPSHOT
#xfire_jaxws_version=1.0-SNAPSHOT
+# from ws-commons ?
xfire_xmlschema_version=20051110
+# ?
xml_apis_version=1.3.02
+# http://xmlbeans.apache.org/, ASL 2
xmlbeans_version=2.0.0
-xml_parser_apis_version=2.2.1
-xmlpull_version=1.1.3.4d_b4_min
+# http://xstream.codehaus.org/, http://xstream.codehaus.org/license.html, BSD, (Used in Geronimo)
xstream_version=1.1.2
+# codehaus ?
yom_version=1.0-alpha-2
Modified: trunk/project.properties (1049 => 1050)
--- trunk/project.properties 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/project.properties 2005-12-08 17:00:35 UTC (rev 1050)
@@ -53,6 +53,7 @@
servicemix-components/project.xml,\
servicemix-console/project.xml,\
servicemix-gbean/project.xml,\
+ servicemix-gplan/project.xml,\
servicemix-common/project.xml,\
servicemix-jms/project.xml,\
servicemix-jsr181/project.xml,\
Modified: trunk/servicemix-components/project.xml (1049 => 1050)
--- trunk/servicemix-components/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/servicemix-components/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -86,48 +86,15 @@
<!-- for DOM, SAX, StAX and XPath support -->
- <!-- To use XPath using JAXP 1.3 (std in Java 5) -->
- <!--
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- <version>1.4-20050623</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xercesImpl</artifactId>
- <version>1.4-20050623</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xalan</artifactId>
- <version>1.4-20050623</version>
- </dependency>
- -->
-
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxp</artifactId>
- <version>1.3</version>
+ <version>${jaxp_version}</version>
<properties>
<lib>true</lib>
</properties>
</dependency>
- <!--
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xercesImpl</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xalan</artifactId>
- <version>1.3</version>
- </dependency>
-
- -->
-
<dependency>
<id>stax+api</id>
<version>${stax_api_version}</version>
@@ -148,19 +115,6 @@
</dependency>
- <!-- reference implementation -->
- <!--
- <dependency>
- <id>stax</id>
- <version>1.1.1-dev</version>
- <properties>
- <lib>true</lib>
- </properties>
- </dependency>
- -->
- <!-- possible StAX implementations: END -->
-
-
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -247,12 +201,12 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-api</artifactId>
- <version>20050915</version>
+ <version>${saaj_version}</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-impl</artifactId>
- <version>20050915</version>
+ <version>${saaj_version}</version>
</dependency>
<dependency>
<groupId>axis</groupId>
@@ -392,12 +346,12 @@
<dependency>
<groupId>activemq</groupId>
<artifactId>smack</artifactId>
- <version>1.5.0</version>
+ <version>${smack_version}</version>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smackx</artifactId>
- <version>1.5.0</version>
+ <version>${smack_version}</version>
</dependency>
@@ -420,16 +374,6 @@
<artifactId>xbean</artifactId>
<version>${xmlbeans_version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlpublic</artifactId>
- <version>2.0.0-beta1</version>
- <properties>
- <optional>true</optional>
- </properties>
- </dependency>
- -->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean_xpath</artifactId>
@@ -458,7 +402,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jsr-223</artifactId>
- <version>1.0-pr</version>
+ <version>${jsr_223_version}</version>
<url>http://www.jcp.org/en/jsr/detail?id=223</url>
</dependency>
@@ -491,24 +435,24 @@
<!-- for XSQL component -->
<dependency>
<groupId>servicemix</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <jar>${oracle_ojdbc14_jar}</jar>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
<artifactId>oraclexsql</artifactId>
- <jar>oraclexsql.jar</jar>
+ <jar>${oracle_oraclexsql_jar}</jar>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>xmlparserv2</artifactId>
- <jar>xmlparserv2.jar</jar>
+ <jar>${oracle_xmlparserv2_jar}</jar>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>xsu12</artifactId>
- <jar>xsu12.jar</jar>
+ <jar>${oracle_xsu12_jar}</jar>
</dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>ojdbc14</artifactId>
- <jar>ojdbc14.jar</jar>
- </dependency>
<!--
|| Dependencies for running test cases
Modified: trunk/servicemix-core/project.xml (1049 => 1050)
--- trunk/servicemix-core/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/servicemix-core/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -80,46 +80,12 @@
<!-- for DOM, SAX, StAX and XPath support -->
-
- <!-- To use XPath using JAXP 1.3 (std in Java 5) -->
- <!--
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- <version>1.4-20050623</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xercesImpl</artifactId>
- <version>1.4-20050623</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xalan</artifactId>
- <version>1.4-20050623</version>
- </dependency>
- -->
-
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxp</artifactId>
- <version>1.3</version>
+ <version>${jaxp_version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xercesImpl</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp-xalan</artifactId>
- <version>1.3</version>
- </dependency>
-
- -->
-
<dependency>
<id>stax+api</id>
<version>${stax_api_version}</version>
@@ -140,16 +106,6 @@
</dependency>
- <!-- reference implementation -->
- <!--
- <dependency>
- <id>stax</id>
- <version>1.1.1-dev</version>
- <properties>
- <lib>true</lib>
- </properties>
- </dependency>
- -->
<!-- possible StAX implementations: END -->
@@ -263,21 +219,6 @@
<!-- default JMS provider used for implementation -->
- <!-- for ActiveMQ 4.x -->
- <!--
- <dependency>
- <id>activemq+core</id>
- <version>4.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>activemq+ra</id>
- <version>4.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>activeio</id>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- -->
<!-- for ActiveMQ 3.x -->
<dependency>
@@ -386,7 +327,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>DdlUtils</artifactId>
- <version>1.0-dev</version>
+ <version>${ddlutils_version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: trunk/servicemix-http/project.xml (1049 => 1050)
--- trunk/servicemix-http/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/servicemix-http/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -194,7 +194,7 @@
</dependency>
<dependency>
<id>stax+api</id>
- <version>1.0</version>
+ <version>${stax_api_version}</version>
</dependency>
<dependency>
Modified: trunk/servicemix-jbi/project.xml (1049 => 1050)
--- trunk/servicemix-jbi/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/servicemix-jbi/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -7,7 +7,7 @@
<name>ServiceMix :: JBI</name>
<id>servicemix-jbi</id>
- <package>javax</package>
+ <package>javax</package>
<packageGroups>
<packageGroup>
<title>JBI Specification APIs</title>
@@ -30,14 +30,14 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxp</artifactId>
- <version>1.3</version>
+ <version>${jaxp_version}</version>
</dependency>
</dependencies>
-
- <build>
- <resources>
- </resources>
- </build>
+ <build>
+ <resources>
+ </resources>
+ </build>
+
</project>
Modified: trunk/servicemix-jsr181/project.xml (1049 => 1050)
--- trunk/servicemix-jsr181/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/servicemix-jsr181/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -179,7 +179,7 @@
<dependency>
<groupId>xfire</groupId>
<artifactId>jaxb-api</artifactId>
- <version>20051114</version>
+ <version>${jaxb_version}</version>
<properties>
<jbi.bundle>true</jbi.bundle>
</properties>
Modified: trunk/servicemix-wsnotification/project.xml (1049 => 1050)
--- trunk/servicemix-wsnotification/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/servicemix-wsnotification/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -82,7 +82,7 @@
<dependency>
<id>stax+api</id>
- <version>1.0</version>
+ <version>${stax_api_version}</version>
</dependency>
<dependency>
Modified: trunk/tooling/servicemix-client/project.xml (1049 => 1050)
--- trunk/tooling/servicemix-client/project.xml 2005-12-08 11:50:30 UTC (rev 1049)
+++ trunk/tooling/servicemix-client/project.xml 2005-12-08 17:00:35 UTC (rev 1050)
@@ -42,7 +42,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxp</artifactId>
- <version>1.3</version>
+ <version>${jaxp_version}</version>
</dependency>
<dependency>
<groupId>org.xbean</groupId>
@@ -67,7 +67,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>${commons_logging_version}</version>
<url>http://jakarta.apache.org/commons/logging/</url>
</dependency>
<dependency>
