svn commit: r14502 - trunk/src/argouml-app/src/default.properties

Author: euluis
Date: 2008-04-28 14:49:36-0700
New Revision: 14502

Modified:
   trunk/src/argouml-app/src/default.properties

Log:
issue 4625: corrections to properties files used in the build - adapting to retructuring made on 2008-4-20

Modified: trunk/src/argouml-app/src/default.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/default.properties?view=diff&rev=14502&p1=trunk/src/argouml-app/src/default.properties&p2=trunk/src/argouml-app/src/default.properties&r1=14501&r2=14502
==============================================================================
--- trunk/src/argouml-app/src/default.properties	(original)
+++ trunk/src/argouml-app/src/default.properties	2008-04-28 14:49:36-0700
@@ -38,14 +38,17 @@
 # path so that it works for subcomponent builds.
 #
 argo.tools.dir=${argo.root.dir}/tools
-argo.model.dir=${argo.root.dir}/src/model
-argo.mdr.dir=${argo.root.dir}/src/model-mdr
-argo.euml.dir=${argo.root.dir}/src/model-euml
-argo.tests.src=${argo.root.dir}/tests
-argo.src.dir=${argo.root.dir}/src/app/src
-argo.lib.dir=${argo.root.dir}/src/app/lib
+argo.model.dir=${argo.root.dir}/src/argouml-core-model
+argo.mdr.dir=${argo.root.dir}/src/argouml-core-model-mdr
+argo.euml.dir=${argo.root.dir}/src/argouml-core-model-euml
+argo.app.dir=${argo.root.dir}/src/argouml-app
+argo.infra.dir=${argo.root.dir}/src/argouml-core-infra
+argo.tests.src=${argo.app.dir}/tests
+argo.src.dir=${argo.app.dir}/src
+argo.lib.dir=${argo.app.dir}/lib
+argo.infra.lib.dir=${argo.infra.dir}/lib
 #
-argo.build.dir=${argo.root.dir}/build
+argo.build.dir=${argo.root.dir}/src/build
 argo.tools.lib=${argo.tools.dir}/lib
 #
 argo.tests.dir=${argo.build.dir}/tests
@@ -108,10 +111,10 @@
 antlrall.jar.path=${argo.lib.dir}/antlr-2.7.7.jar
 commons-logging.jar.path=${argo.lib.dir}/commons-logging-1.0.2.jar
 gef.jar.path=${argo.lib.dir}/gef-0.12.4BETA2.jar
-log4j.jar.path=${argo.lib.dir}/log4j-1.2.6.jar
+log4j.jar.path=${argo.infra.lib.dir}/log4j-1.2.6.jar
 ocl-argo.jar.path=${argo.lib.dir}/ocl-argo-1.1.jar
 swidgets.jar.path=${argo.lib.dir}/swidgets-0.1.4.jar
-toolbar.jar.path=${argo.lib.dir}/toolbar-1.4.jar
+toolbar.jar.path=${argo.lib.dir}/toolbar-1.4.1-20071227.jar
 #
 # JARs from tools directory
 #