dain 2004/12/11 23:03:30
Modified: etc maven.xml project.properties project.xml
Removed: etc global.properties locator.ent version-info.ent
Log:
Replaced xml parsed entities for dependency version numbers with
project.properties
Revision Changes Path
1.4 +1 -20 openejb/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 4 Sep 2004 21:00:36 -0000 1.3
+++ maven.xml 12 Dec 2004 04:03:30 -0000 1.4
@@ -17,25 +17,6 @@
<!-- Determine what the top-level project root is -->
<j:set var="project.root"
value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
- <!-- Load the global properties -->
- <ant:property file="${project.root}/etc/global.properties"/>
-
- <!-- convert the version-info.ent into a properties file and load that
file -->
- <copy file="${project.root}/etc/version-info.ent"
tofile="${project.root}/etc/version-info.properties" overwrite="true"/>
- <replaceregexp file="${project.root}/etc/version-info.properties"
- match='<!ENTITY *(.*)-version *"(.*)">'
- replace="\1_version=\2"
- byline="true"/>
- <replaceregexp file="${project.root}/etc/version-info.properties"
- match="(..*)-(..*)-(..*).version=(.*)"
- replace="\1_\2_\3_version=\4"
- byline="true"/>
- <replaceregexp file="${project.root}/etc/version-info.properties"
- match="(..*)-(..*).version=(.*)"
- replace="\1_\2_version=\3"
- byline="true"/>
- <ant:property file="${project.root}/etc/version-info.properties"/>
-
<!-- ==================== -->
<!-- Default Global Goals -->
<!-- ==================== -->
1.3 +171 -1 openejb/etc/project.properties
Index: project.properties
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 8 Sep 2004 05:53:37 -0000 1.2
+++ project.properties 12 Dec 2004 04:03:30 -0000 1.3
@@ -1 +1,171 @@
-maven.remote.group=openejb
\ No newline at end of file
+##
+## $Revision$ $Date$
+##
+
+#####################################################
+# Build and Deployment
+#####################################################
+
+maven.remote.group=openejb
+
+maven.repo.remote=http://www.ibiblio.org/maven/
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+maven.compile.deprecation=true
+maven.compile.debug=true
+maven.compile.optimize=true
+
+maven.junit.fork=true
+maven.junit.jvmargs=-ea
+
+maven.simian.linecount=3
+
+# Force module tests to run, even if maven thinks they have passed
+#maven.test.force=true
+
+
+#####################################################
+# Properties related to project-site
+#####################################################
+
+maven.xdoc.date=left
+maven.xdoc.version=${pom.currentVersion}
+
+maven.linkcheck.enable=true
+
+maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/
+maven.javadoc.source=1.4
+
+
+#####################################################
+# Dependency Versions
+#####################################################
+
+activemq_version=1.2-SNAPSHOT
+geronimo_version=1.0-SNAPSHOT
+openejb_version=2.0-SNAPSHOT
+tranql_version=1.0-SNAPSHOT
+tranql_connector_version=1.0-SNAPSHOT
+
+geronimo_spec_activation_version=1.0.2-rc3
+geronimo_spec_ejb_version=2.1-rc3
+geronimo_spec_j2ee_version=1.4-rc3
+geronimo_spec_j2ee_connector_version=1.5-rc3
+geronimo_spec_j2ee_deployment_version=1.1-rc3
+geronimo_spec_j2ee_jacc_version=1.0-rc3
+geronimo_spec_j2ee_management_version=1.0-rc3
+geronimo_spec_javamail_version=1.3.1-rc3
+geronimo_spec_jaxr_version=1.0-rc3
+geronimo_spec_jms_version=1.1-rc3
+geronimo_spec_jsp_version=2.0-rc3
+geronimo_spec_jta_version=1.0.1B-rc3
+geronimo_spec_servlet_version=2.4-rc3
+
+activecluster_version=1.0-SNAPSHOT
+activemq_jetty_version=4.2.20RC0
+ant_version=1.5
+antlr_version=2.7.2
+avalon_framework_version=4.1.4
+avalon_logkit_version=1.2.2
+axion_version=1.0-M3-dev
+axis_version=1.2-RC1
+axis_jaxrpc_version=1.2-RC1
+axis_saaj_version=1.2-RC1
+axis_wsdl4j_version=1.2-RC1
+axis_commons_logging_version=SNAPSHOT
+axis_commons_discovery_version=SNAPSHOT
+cglib_version=2.0
+castor_version=0.9.5.3
+commons_beanutils_version=1.6.1
+commons_cli_version=1.0
+commons_collections_version=2.1
+commons_dbcp_version=1.2
+commons_digester_version=1.6
+commons_el_version=1.0
+commons_fileupload_version=1.0
+commons_httpclient_version=2.0.1
+commons_jelly_version=1.0-beta-4
+commons_jxpath_version=1.1
+commons_logging_version=1.0.3
+commons_modeler_version=1.1
+commons_primitives_version=1.0
+commons_pool_version=1.2
+concurrent_version=1.3.4
+derby_version=47170
+dom4j_version=1.4
+drools_version=2.0-beta-13
+emberio_version=0.3-alpha
+ews_version=SNAPSHOT
+howl_version=0.1.8
+hsqldb_version=1.7.2.2
+javacc_version=2.1
+jaxb_ri_version=SNAPSHOT
+jdbm_version=0.20-dev
+jelly_velocity_tags_version=SNAPSHOT
+jetty_version=5.1-SNAPSHOT
+jgroups_version=2.2.5
+jrms_version=1.1
+junit_version=3.8.1
+jxta_version=2.0
+log4j_version=1.2.8
+maven_itest_plugin_version=1.0
+maven_version=1.0
+mockobjects_version=0.09
+mx4j_version=2.0.1
+openorb_version=1.4.0-GERONIMO
+oro_version=2.0.8
+p2psockets_version=1.1.2
+regexp_version=1.3
+spring_version=1.0.1
+tomcat_version=5.0.28
+velocity_version=1.4-rc1
+xerces_version=2.6.0
+xml_apis_version=1.0.b2
+xml_resolver_version=1.1
+xml_parser_apis_version=2.2.1
+xmlbeans_version=1.0-DEV
+xmlpull_version=1.1.3.4d_b4_min
+xstream_version=1.0.2
+xpp3_version=1.1.3.3
+
+#####################################################
+# Site Colors
+#####################################################
+
+maven.ui.body.background=#FFFFFF
+maven.ui.body.foreground=#1F354D
+maven.ui.section.background=#A2B7C5
+maven.ui.section.foreground=#FFFFFF
+maven.ui.subsection.foreground=#1F354D
+maven.ui.subsection.background=#F2F5F7
+maven.ui.table.header.background=#E5E3DB
+maven.ui.table.header.foreground=#686868
+maven.ui.table.row.odd.foreground=#686868
+maven.ui.table.row.even.background=#F5F4F1
+maven.ui.table.row.odd.background=#F5F4F1
+maven.ui.table.row.even.foreground=#686868
+maven.ui.banner.background=#FFFFFF
+maven.ui.banner.foreground=#FFFFFF
+maven.ui.banner.border.top=#A2B7C5
+maven.ui.banner.border.bottom=#A2B7C5
+maven.ui.source.background=#FFFFFF
+maven.ui.source.foreground=#000000
+maven.ui.source.border.right=#A2B7C5
+maven.ui.source.border.top=#A2B7C5
+maven.ui.source.border.left=#A2B7C5
+maven.ui.source.border.bottom=#A2B7C5
+maven.ui.navcol.background=#F2F5F7
+maven.ui.navcol.background.ns4=#F2F5F7
+maven.ui.navcol.foreground=#000000
+maven.ui.navcol.foreground.ns4=#555
+maven.ui.navcol.border.top=#F2F5F7
+maven.ui.navcol.border.right=#A2B7C5
+maven.ui.navcol.border.bottom=#A2B7C5
+maven.ui.breadcrumbs.background=#D5E1E9
+maven.ui.breadcrumbs.foreground=#000000
+maven.ui.breadcrumbs.border.bottom=#A2B7C5
+maven.ui.breadcrumbs.border.top=#D5E1E9
+maven.ui.href.link=#1F354D
+maven.ui.href.link.active=#FF5A00
+maven.ui.href.link.selfref=#1F354D
1.7 +2 -8 openejb/etc/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 4 Sep 2004 21:00:36 -0000 1.6
+++ project.xml 12 Dec 2004 04:03:30 -0000 1.7
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-<!ENTITY % locator SYSTEM "file:locator.ent">
-%locator;
-%versions;
- ]>
-
<!-- $Revision$ $Date$ -->
<project>
@@ -67,7 +61,7 @@
<!-- Versions -->
<!-- ======== -->
- <currentVersion>&openejb-version;</currentVersion>
+ <currentVersion>${openejb_version}</currentVersion>
<versions>
<version>
