Revision: 14436
http://gate.svn.sourceforge.net/gate/?rev=14436&view=rev
Author: valyt
Date: 2011-10-26 08:13:47 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Moved all parameterisable properties to a top-level build.properties file,
which is then used by all modules.
The version number is now only mentioned once in the whole source tree.
Modified Paths:
--------------
mimir/trunk/build.xml
mimir/trunk/mimir-client/build.xml
mimir/trunk/mimir-core/build.xml
mimir/trunk/mimir-test/build.xml
mimir/trunk/plugins/db-h2/build.xml
mimir/trunk/plugins/measurements/build.xml
mimir/trunk/plugins/ordi/build.xml
mimir/trunk/plugins/sesame/build.xml
mimir/trunk/plugins/sparql/build.xml
Added Paths:
-----------
mimir/trunk/build.properties
mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy.template
Removed Paths:
-------------
mimir/trunk/mimir-core/build.properties
mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy
Copied: mimir/trunk/build.properties (from rev 14430,
mimir/trunk/mimir-core/build.properties)
===================================================================
--- mimir/trunk/build.properties (rev 0)
+++ mimir/trunk/build.properties 2011-10-26 08:13:47 UTC (rev 14436)
@@ -0,0 +1,8 @@
+app.version=3.3.1-snapshot
+mimir-core.dirname=mimir-core
+mimir-client.dirname=mimir-client
+plugins.dirname=plugins
+grails-plugin.dirname=mimir-web
+grails-demo-webapp.dirname=mimir-demo
+
+
Modified: mimir/trunk/build.xml
===================================================================
--- mimir/trunk/build.xml 2011-10-26 01:28:12 UTC (rev 14435)
+++ mimir/trunk/build.xml 2011-10-26 08:13:47 UTC (rev 14436)
@@ -1,14 +1,14 @@
<project name="mimir" default="all">
<property file="build.properties" />
+
+ <property name="mimir-core.dir" location="${mimir-core.dirname}" />
+ <property name="mimir-client.dir" location="${mimir-client.dirname}" />
+ <property name="plugins.dir" location="${plugins.dirname}" />
+ <property name="grails-plugin.dir" location="${grails-plugin.dirname}" />
+ <property name="grails-demo-webapp.dir"
+ location="${grails-demo-webapp.dirname}" />
+
<property file="mimir-web/application.properties" prefix="mimir.web." />
-
- <property name="mimir-core.dir" location="mimir-core" />
-
- <property name="mimir-client.dir" location="mimir-client" />
- <property name="plugins.dir" location="plugins" />
- <property name="grails-plugin.dir" location="mimir-web" />
- <property name="grails-demo-webapp.name" value="mimir-demo" />
- <property name="grails-demo-webapp.dir"
location="${grails-demo-webapp.name}" />
<!-- Load the AntContrib tasks -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
@@ -74,6 +74,17 @@
</target>
<target name="grails-plugin" depends="grails.command">
+ <!-- Update the version for the mimir-web plugin -->
+ <copy file="${grails-plugin.dir}/MimirWebGrailsPlugin.groovy.template"
+ tofile="${grails-plugin.dir}/MimirWebGrailsPlugin.groovy"
+ overwrite="true" >
+ <filterset>
+ <filter token="version" value="${app.version}" />
+ </filterset>
+ </copy>
+
+
+
<!-- The first compile always fails due to GWT classes being added to the
classpath too late. When that happens, we need to run compile a second
time.
-->
@@ -84,7 +95,7 @@
</grails>
</try>
<catch>
- <echo>First Grails compilation failed (GWT not on the classpath?).
Re-trying...</echo>
+ <echo>First Grails compilation failed (GWT not on the classpath?);
re-trying...</echo>
<grails dir="${grails-plugin.dir}">
<arg value="compile" />
</grails>
@@ -114,11 +125,17 @@
</grails>
<xmlproperty prefix="mimir.web" file="${grails-plugin.dir}/plugin.xml" />
+
<grails dir=".">
<arg value="create-app" />
<arg value="${grails-demo-webapp.name}" />
</grails>
+ <grails dir=".">
+ <arg value="set-version" />
+ <arg value="${app.version}" />
+ </grails>
+
<grails dir="${grails-demo-webapp.dir}">
<arg value="install-plugin" />
<arg
file="${grails-plugin.dir}/grails-${mimir.web.plugin(name)}-${mimir.web.plugin(version)}.zip"
/>
@@ -134,7 +151,7 @@
</grails>
</try>
<catch>
- <echo>First Grails compilation failed (GWT not on the classpath?).
Re-trying...</echo>
+ <echo>First Grails compilation failed (GWT not on the classpath?);
re-trying...</echo>
<grails dir="${grails-demo-webapp.dir}">
<arg value="compile" />
</grails>
Modified: mimir/trunk/mimir-client/build.xml
===================================================================
--- mimir/trunk/mimir-client/build.xml 2011-10-26 01:28:12 UTC (rev 14435)
+++ mimir/trunk/mimir-client/build.xml 2011-10-26 08:13:47 UTC (rev 14436)
@@ -3,22 +3,22 @@
<property name="app.title" value="Mimir Client" />
<!-- Common Properties -->
-
+ <property file="../build.properties" />
<property environment="env"/>
- <property name="core-home" value="../mimir-core"/>
- <property file="${core-home}/build.properties" />
+
+ <property name="core-home" location="../${mimir-core.dirname}"/>
<path id="libs">
<fileset dir="${core-home}/lib" includes="**/*.jar" />
- <fileset dir="${core-home}" includes="mimir-core-*.jar" />
+ <fileset dir="${core-home}" includes="mimir-core-${app.version}.jar" />
</path>
<property name="classes.dir" location="classes" />
<property name="src.dir" location="src" />
<property name="doc.dir" location="doc" />
- <property name="mimir.grails.plugin" location="../mimir-web" />
-
+ <property name="grails-plugin.dir"
location="../${grails-plugin.dirname}" />
+
<property name="jar.file" location="${app.name}-${app.version}.jar" />
<path id="compile.classpath">
<path refid="libs" />
@@ -26,7 +26,9 @@
<target name="clean">
<delete dir="${classes.dir}"/>
- <delete file="${jar.file}"/>
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
@@ -70,7 +72,7 @@
</target>
<target name="publish" depends="jar">
- <copy todir="${mimir.grails.plugin}/lib" flatten="true">
+ <copy todir="${grails-plugin.dir}/lib" flatten="true">
<fileset file="${jar.file}" />
</copy>
</target>
Deleted: mimir/trunk/mimir-core/build.properties
===================================================================
--- mimir/trunk/mimir-core/build.properties 2011-10-26 01:28:12 UTC (rev
14435)
+++ mimir/trunk/mimir-core/build.properties 2011-10-26 08:13:47 UTC (rev
14436)
@@ -1 +0,0 @@
-app.version=3.3.1-snapshot
Modified: mimir/trunk/mimir-core/build.xml
===================================================================
--- mimir/trunk/mimir-core/build.xml 2011-10-26 01:28:12 UTC (rev 14435)
+++ mimir/trunk/mimir-core/build.xml 2011-10-26 08:13:47 UTC (rev 14436)
@@ -2,7 +2,7 @@
<property name="app.name" value="mimir-core" />
<property name="app.title" value="Mimir Core" />
- <property file="build.properties" />
+ <property file="../build.properties" />
<!-- Common Properties -->
<property environment="env"/>
@@ -14,7 +14,7 @@
<property name="src.dir" location="src" />
<property name="doc.dir" location="doc" />
- <property name="mimir.grails.plugin" location="../mimir-web" />
+ <property name="grails-plugin.dir"
location="../${grails-plugin.dirname}" />
<property name="jar.file" location="${app.name}-${app.version}.jar" />
<path id="compile.classpath">
@@ -23,7 +23,9 @@
<target name="clean">
<delete dir="${classes.dir}"/>
- <delete file="${jar.file}"/>
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
@@ -76,7 +78,7 @@
</target>
<target name="publish" depends="jar">
- <copy todir="${mimir.grails.plugin}/lib" flatten="true">
+ <copy todir="${grails-plugin.dir}/lib" flatten="true">
<fileset refid="libs.fileset" />
<fileset file="${jar.file}" />
</copy>
Modified: mimir/trunk/mimir-test/build.xml
===================================================================
--- mimir/trunk/mimir-test/build.xml 2011-10-26 01:28:12 UTC (rev 14435)
+++ mimir/trunk/mimir-test/build.xml 2011-10-26 08:13:47 UTC (rev 14436)
@@ -3,15 +3,15 @@
<property name="app.title" value="Mimir Tests" />
<!-- Common Properties -->
-
+ <property file="../build.properties" />
<property environment="env"/>
- <property name="core-home" value="../mimir-core"/>
- <property file="${core-home}/build.properties" />
-
+
+ <property name="core-home" location="../${mimir-core.dirname}"/>
+
<path id="libs">
<fileset dir="lib" includes="**/*.jar" />
<fileset dir="${core-home}/lib" includes="**/*.jar" />
- <fileset dir="${core-home}" includes="mimir-core-*.jar" />
+ <fileset dir="${core-home}" includes="mimir-core-${app.version}.jar" />
</path>
<property name="classes.dir" location="classes" />
Deleted: mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy
===================================================================
--- mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy 2011-10-26 01:28:12 UTC
(rev 14435)
+++ mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy 2011-10-26 08:13:47 UTC
(rev 14436)
@@ -1,197 +0,0 @@
-/*
- * MimirWebGrailsPlugin.groovy
- *
- * Copyright (c) 2007-2011, The University of Sheffield.
- *
- * This file is part of GATE Mímir (see http://gate.ac.uk/family/mimir.html),
- * and is free software, licenced under the GNU Affero General Public License,
- * Version 3, November 2007 (also included with this distribution as file
- * LICENCE-AGPL3.html).
- *
- * A commercial licence is also available for organisations whose business
- * models preclude the adoption of open source and is subject to a licence
- * fee charged by the University of Sheffield. Please contact the GATE team
- * (see http://gate.ac.uk/g8/contact) if you require a commercial licence.
- *
- * $Id$
- */
-import gate.Gate;
-
-import gate.mimir.util.WebUtilsManager;
-import gate.mimir.web.IndexTemplate
-import gate.mimir.web.MimirConfigLoader
-import gate.util.spring.ExtraGatePlugin
-
-import java.util.concurrent.Executors
-
-import org.apache.log4j.Logger
-import org.codehaus.groovy.grails.commons.ConfigurationHolder as CH
-
-class MimirWebGrailsPlugin {
- static Logger log = Logger.getLogger('gate.mimir.mimir-web')
-
- // the plugin version
- def version = "3.3.1-snapshot"
- // the version or versions of Grails the plugin is designed for
- def grailsVersion = "1.3.5 > *"
- // the other plugins this plugin depends on
- def dependsOn = [:]
- // resources that are excluded from plugin packaging
- def pluginExcludes = [
- "grails-app/views/error.gsp"
- ]
-
- // TODO Fill in these fields
- def author = "GATE Team"
- def authorEmail = "[email protected]"
- def title = "Mimir"
- def description = '''\
-Multi-paradigm Information Management Index and Repository
-
-see http://gate.ac.uk/family/mimir for full details
-'''
-
- // URL to the plugin's documentation
- def documentation = "http://grails.org/plugin/mimir-web";
-
- def doWithWebDescriptor = { xml ->
- // TODO Implement additions to web.xml (optional), this event occurs
before
- }
-
- def doWithSpring = {
- MimirConfigLoader.loadMimirConfig()
-
- // web utils manager
- webUtilsManager(WebUtilsManager)
-
- // thread pool for the search service
- searchThreadPool(Executors) { bean ->
- bean.factoryMethod = 'newCachedThreadPool'
- bean.destroyMethod = 'shutdown'
- }
-
- xmlns gate:'http://gate.ac.uk/ns/spring'
- // take <gate:init> attributes from configuration
- gate.init(CH.config.gate.mimir.gateInit)
-
- // Mimir plugins
- if(application.warDeployed) {
- // we are in a WAR deployment, load all plugins listed in
WEB-INF/mimir-plugins.xml
- def pluginsXml = null
-
application.parentContext.getResource("WEB-INF/mimir-plugins.xml")?.inputStream.withStream
{
- pluginsXml = new XmlSlurper().parse(it)
- }
- if(pluginsXml?.plugin) {
- for(plugin in pluginsXml.plugin) {
- "mimirPlugin-${plugin}"(ExtraGatePlugin) {
- location = "WEB-INF/mimir-plugins/${plugin}"
- }
- }
- }
- // and all other plugins whose locations are absolute URLs
- if(CH.config.gate.mimir.plugins) {
- for(loc in CH.config.gate.mimir.plugins.entrySet()) {
- if(loc.value =~ /^[a-z]{2,}:/) {
- "mimirPlugin-${loc.key}"(ExtraGatePlugin) {
- location = loc.value
- }
- }
- }
- }
- } else {
- // run-app - load the configured plugins directly
- if(CH.config.gate.mimir.plugins) {
- URI baseURI = new File(System.getProperty('user.dir')).toURI()
- for(loc in CH.config.gate.mimir.plugins.entrySet()) {
- "mimirPlugin-${loc.key}"(ExtraGatePlugin) {
- location = baseURI.resolve(loc.value).toString()
- }
- }
- }
- }
-
- // the default query tokeniser (can be overridden in the
- // host app's resources.xml/groovy
- gate.'saved-application'(id:"queryTokeniser",
- location:CH.config.gate.mimir.queryTokeniserGapp.toString())
- }
-
- def doWithDynamicMethods = { ctx ->
- // TODO Implement registering dynamic methods to classes (optional)
- }
-
- def doWithApplicationContext = { applicationContext ->
- if(IndexTemplate.count() == 0) {
- log.info("No index templates found in database, adding default one")
-
- def defaultHelper = 'gate.mimir.db.DBSemanticAnnotationHelper'
- try {
- Class.forName(defaultHelper, true, Gate.classLoader)
- } catch(Exception e) {
- // db not loaded, try ordi
- defaultHelper = 'gate.mimir.ordi.ORDISemanticAnnotationHelper'
- try {
- Class.forName(defaultHelper, true, Gate.classLoader)
- } catch(Exception e2) {
- defaultHelper = 'com.example.MySemanticAnnotationHelper'
- }
- }
-
- def defaultIndexConfig = """\
-import gate.creole.ANNIEConstants
-import gate.mimir.index.OriginalMarkupMetadataHelper
-import ${defaultHelper} as DefaultHelper
-
-tokenASName = "mimir"
-tokenAnnotationType = ANNIEConstants.TOKEN_ANNOTATION_TYPE
-tokenFeatures = {
- string()
- category()
- root()
-}
-
-semanticASName = "mimir"
-semanticAnnotations = {
- index {
- annotation helper:new DefaultHelper(annType:'Sentence')
- }
- index {
- annotation helper:new DefaultHelper(annType:'Person',
nominalFeatures:["gender"])
- annotation helper:new DefaultHelper(annType:'Location',
nominalFeatures:["locType"])
- annotation helper:new DefaultHelper(annType:'Organization',
nominalFeatures:["orgType"])
- annotation helper:new DefaultHelper(annType:'Date',
integerFeatures:["normalized"])
- }
-}
-documentRenderer = new OriginalMarkupMetadataHelper()
-documentMetadataHelpers = [documentRenderer]
-"""
- IndexTemplate.withTransaction {
- def defaultTemplate = new IndexTemplate(
- name:'default',
- comment:'The default index configuration',
- configuration:defaultIndexConfig)
-
- if(!defaultTemplate.save(flush:true)) {
- log.warn("Couldn't save default index template")
- }
- }
- }
-
- // initialise the index services, in the right order
- applicationContext.localIndexService.init()
- applicationContext.remoteIndexService.init()
- applicationContext.federatedIndexService.init()
- }
-
- def onChange = { event ->
- // TODO Implement code that is executed when any artefact that this
plugin is
- // watching is modified and reloaded. The event contains: event.source,
- // event.application, event.manager, event.ctx, and event.plugin.
- }
-
- def onConfigChange = { event ->
- // TODO Implement code that is executed when the project configuration
changes.
- // The event is the same as for 'onChange'.
- }
-
-}
Added: mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy.template
===================================================================
--- mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy.template
(rev 0)
+++ mimir/trunk/mimir-web/MimirWebGrailsPlugin.groovy.template 2011-10-26
08:13:47 UTC (rev 14436)
@@ -0,0 +1,197 @@
+/*
+ * MimirWebGrailsPlugin.groovy
+ *
+ * Copyright (c) 2007-2011, The University of Sheffield.
+ *
+ * This file is part of GATE Mímir (see http://gate.ac.uk/family/mimir.html),
+ * and is free software, licenced under the GNU Affero General Public License,
+ * Version 3, November 2007 (also included with this distribution as file
+ * LICENCE-AGPL3.html).
+ *
+ * A commercial licence is also available for organisations whose business
+ * models preclude the adoption of open source and is subject to a licence
+ * fee charged by the University of Sheffield. Please contact the GATE team
+ * (see http://gate.ac.uk/g8/contact) if you require a commercial licence.
+ *
+ * $Id$
+ */
+import gate.Gate;
+
+import gate.mimir.util.WebUtilsManager;
+import gate.mimir.web.IndexTemplate
+import gate.mimir.web.MimirConfigLoader
+import gate.util.spring.ExtraGatePlugin
+
+import java.util.concurrent.Executors
+
+import org.apache.log4j.Logger
+import org.codehaus.groovy.grails.commons.ConfigurationHolder as CH
+
+class MimirWebGrailsPlugin {
+ static Logger log = Logger.getLogger('gate.mimir.mimir-web')
+
+ // the plugin version
+ def version = "@version@"
+ // the version or versions of Grails the plugin is designed for
+ def grailsVersion = "1.3.5 > *"
+ // the other plugins this plugin depends on
+ def dependsOn = [:]
+ // resources that are excluded from plugin packaging
+ def pluginExcludes = [
+ "grails-app/views/error.gsp"
+ ]
+
+ // TODO Fill in these fields
+ def author = "GATE Team"
+ def authorEmail = "[email protected]"
+ def title = "Mimir"
+ def description = '''\
+Multi-paradigm Information Management Index and Repository
+
+see http://gate.ac.uk/family/mimir for full details
+'''
+
+ // URL to the plugin's documentation
+ def documentation = "http://grails.org/plugin/mimir-web";
+
+ def doWithWebDescriptor = { xml ->
+ // TODO Implement additions to web.xml (optional), this event occurs
before
+ }
+
+ def doWithSpring = {
+ MimirConfigLoader.loadMimirConfig()
+
+ // web utils manager
+ webUtilsManager(WebUtilsManager)
+
+ // thread pool for the search service
+ searchThreadPool(Executors) { bean ->
+ bean.factoryMethod = 'newCachedThreadPool'
+ bean.destroyMethod = 'shutdown'
+ }
+
+ xmlns gate:'http://gate.ac.uk/ns/spring'
+ // take <gate:init> attributes from configuration
+ gate.init(CH.config.gate.mimir.gateInit)
+
+ // Mimir plugins
+ if(application.warDeployed) {
+ // we are in a WAR deployment, load all plugins listed in
WEB-INF/mimir-plugins.xml
+ def pluginsXml = null
+
application.parentContext.getResource("WEB-INF/mimir-plugins.xml")?.inputStream.withStream
{
+ pluginsXml = new XmlSlurper().parse(it)
+ }
+ if(pluginsXml?.plugin) {
+ for(plugin in pluginsXml.plugin) {
+ "mimirPlugin-${plugin}"(ExtraGatePlugin) {
+ location = "WEB-INF/mimir-plugins/${plugin}"
+ }
+ }
+ }
+ // and all other plugins whose locations are absolute URLs
+ if(CH.config.gate.mimir.plugins) {
+ for(loc in CH.config.gate.mimir.plugins.entrySet()) {
+ if(loc.value =~ /^[a-z]{2,}:/) {
+ "mimirPlugin-${loc.key}"(ExtraGatePlugin) {
+ location = loc.value
+ }
+ }
+ }
+ }
+ } else {
+ // run-app - load the configured plugins directly
+ if(CH.config.gate.mimir.plugins) {
+ URI baseURI = new File(System.getProperty('user.dir')).toURI()
+ for(loc in CH.config.gate.mimir.plugins.entrySet()) {
+ "mimirPlugin-${loc.key}"(ExtraGatePlugin) {
+ location = baseURI.resolve(loc.value).toString()
+ }
+ }
+ }
+ }
+
+ // the default query tokeniser (can be overridden in the
+ // host app's resources.xml/groovy
+ gate.'saved-application'(id:"queryTokeniser",
+ location:CH.config.gate.mimir.queryTokeniserGapp.toString())
+ }
+
+ def doWithDynamicMethods = { ctx ->
+ // TODO Implement registering dynamic methods to classes (optional)
+ }
+
+ def doWithApplicationContext = { applicationContext ->
+ if(IndexTemplate.count() == 0) {
+ log.info("No index templates found in database, adding default one")
+
+ def defaultHelper = 'gate.mimir.db.DBSemanticAnnotationHelper'
+ try {
+ Class.forName(defaultHelper, true, Gate.classLoader)
+ } catch(Exception e) {
+ // db not loaded, try ordi
+ defaultHelper = 'gate.mimir.ordi.ORDISemanticAnnotationHelper'
+ try {
+ Class.forName(defaultHelper, true, Gate.classLoader)
+ } catch(Exception e2) {
+ defaultHelper = 'com.example.MySemanticAnnotationHelper'
+ }
+ }
+
+ def defaultIndexConfig = """\
+import gate.creole.ANNIEConstants
+import gate.mimir.index.OriginalMarkupMetadataHelper
+import ${defaultHelper} as DefaultHelper
+
+tokenASName = "mimir"
+tokenAnnotationType = ANNIEConstants.TOKEN_ANNOTATION_TYPE
+tokenFeatures = {
+ string()
+ category()
+ root()
+}
+
+semanticASName = "mimir"
+semanticAnnotations = {
+ index {
+ annotation helper:new DefaultHelper(annType:'Sentence')
+ }
+ index {
+ annotation helper:new DefaultHelper(annType:'Person',
nominalFeatures:["gender"])
+ annotation helper:new DefaultHelper(annType:'Location',
nominalFeatures:["locType"])
+ annotation helper:new DefaultHelper(annType:'Organization',
nominalFeatures:["orgType"])
+ annotation helper:new DefaultHelper(annType:'Date',
integerFeatures:["normalized"])
+ }
+}
+documentRenderer = new OriginalMarkupMetadataHelper()
+documentMetadataHelpers = [documentRenderer]
+"""
+ IndexTemplate.withTransaction {
+ def defaultTemplate = new IndexTemplate(
+ name:'default',
+ comment:'The default index configuration',
+ configuration:defaultIndexConfig)
+
+ if(!defaultTemplate.save(flush:true)) {
+ log.warn("Couldn't save default index template")
+ }
+ }
+ }
+
+ // initialise the index services, in the right order
+ applicationContext.localIndexService.init()
+ applicationContext.remoteIndexService.init()
+ applicationContext.federatedIndexService.init()
+ }
+
+ def onChange = { event ->
+ // TODO Implement code that is executed when any artefact that this
plugin is
+ // watching is modified and reloaded. The event contains: event.source,
+ // event.application, event.manager, event.ctx, and event.plugin.
+ }
+
+ def onConfigChange = { event ->
+ // TODO Implement code that is executed when the project configuration
changes.
+ // The event is the same as for 'onChange'.
+ }
+
+}
Modified: mimir/trunk/plugins/db-h2/build.xml
===================================================================
--- mimir/trunk/plugins/db-h2/build.xml 2011-10-26 01:28:12 UTC (rev 14435)
+++ mimir/trunk/plugins/db-h2/build.xml 2011-10-26 08:13:47 UTC (rev 14436)
@@ -3,14 +3,14 @@
<property name="app.title" value="Mimir Plugin: DB (H2)" />
<!-- Common Properties -->
-
<property environment="env" />
- <property name="core-home" value="../../mimir-core" />
- <property file="${core-home}/build.properties" />
+ <property file="../../build.properties" />
+ <property name="core-home" location="../../${mimir-core.dirname}"/>
+
<path id="core-libs">
<fileset dir="${core-home}/lib" includes="**/*.jar" />
- <fileset dir="${core-home}" includes="mimir-core-*.jar" />
+ <fileset dir="${core-home}" includes="mimir-core-${app.version}.jar" />
</path>
<path id="local-libs">
@@ -35,7 +35,9 @@
<target name="clean">
<delete dir="${classes.dir}" />
- <delete file="${jar.file}" />
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
Modified: mimir/trunk/plugins/measurements/build.xml
===================================================================
--- mimir/trunk/plugins/measurements/build.xml 2011-10-26 01:28:12 UTC (rev
14435)
+++ mimir/trunk/plugins/measurements/build.xml 2011-10-26 08:13:47 UTC (rev
14436)
@@ -3,11 +3,11 @@
<property name="app.title" value="Mimir Plugin: Measurements" />
<!-- Common Properties -->
+ <property environment="env" />
+ <property file="../../build.properties" />
+
+ <property name="core-home" location="../../${mimir-core.dirname}"/>
- <property environment="env"/>
- <property name="core-home" value="../../mimir-core"/>
- <property file="${core-home}/build.properties" />
-
<path id="core-libs">
<fileset dir="${core-home}/lib" includes="**/*.jar" />
<fileset dir="${core-home}" includes="mimir-core-*.jar" />
@@ -34,7 +34,9 @@
<target name="clean">
<delete dir="${classes.dir}"/>
- <delete file="${jar.file}"/>
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
Modified: mimir/trunk/plugins/ordi/build.xml
===================================================================
--- mimir/trunk/plugins/ordi/build.xml 2011-10-26 01:28:12 UTC (rev 14435)
+++ mimir/trunk/plugins/ordi/build.xml 2011-10-26 08:13:47 UTC (rev 14436)
@@ -3,11 +3,11 @@
<property name="app.title" value="Mimir Plugin: ORDI" />
<!-- Common Properties -->
-
- <property environment="env"/>
- <property name="core-home" value="../../mimir-core"/>
- <property file="${core-home}/build.properties" />
-
+ <property environment="env" />
+ <property file="../../build.properties" />
+
+ <property name="core-home" location="../../${mimir-core.dirname}"/>
+
<path id="core-libs">
<fileset dir="${core-home}/lib" includes="**/*.jar" />
<fileset dir="${core-home}" includes="mimir-core-*.jar" />
@@ -34,7 +34,9 @@
<target name="clean">
<delete dir="${classes.dir}"/>
- <delete file="${jar.file}"/>
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
Modified: mimir/trunk/plugins/sesame/build.xml
===================================================================
--- mimir/trunk/plugins/sesame/build.xml 2011-10-26 01:28:12 UTC (rev
14435)
+++ mimir/trunk/plugins/sesame/build.xml 2011-10-26 08:13:47 UTC (rev
14436)
@@ -3,11 +3,11 @@
<property name="app.title" value="Mimir Plugin: Sesame" />
<!-- Common Properties -->
-
- <property environment="env"/>
- <property name="core-home" value="../../mimir-core"/>
- <property file="${core-home}/build.properties" />
-
+ <property environment="env" />
+ <property file="../../build.properties" />
+
+ <property name="core-home" location="../../${mimir-core.dirname}"/>
+
<path id="core-libs">
<fileset dir="${core-home}/lib" includes="**/*.jar" />
<fileset dir="${core-home}" includes="mimir-core-*.jar" />
@@ -36,7 +36,9 @@
<target name="clean">
<delete dir="${classes.dir}"/>
- <delete file="${jar.file}"/>
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
Modified: mimir/trunk/plugins/sparql/build.xml
===================================================================
--- mimir/trunk/plugins/sparql/build.xml 2011-10-26 01:28:12 UTC (rev
14435)
+++ mimir/trunk/plugins/sparql/build.xml 2011-10-26 08:13:47 UTC (rev
14436)
@@ -3,11 +3,11 @@
<property name="app.title" value="Mimir Plugin: SPARQL" />
<!-- Common Properties -->
+ <property environment="env" />
+ <property file="../../build.properties" />
+
+ <property name="core-home" location="../../${mimir-core.dirname}"/>
- <property environment="env"/>
- <property name="core-home" value="../../mimir-core"/>
- <property file="${core-home}/build.properties" />
-
<path id="core-libs">
<fileset dir="${core-home}/lib" includes="**/*.jar" />
<fileset dir="${core-home}" includes="mimir-core-*.jar" />
@@ -25,7 +25,9 @@
<target name="clean">
<delete dir="${classes.dir}"/>
- <delete file="${jar.file}"/>
+ <delete>
+ <fileset dir="." includes="${app.name}-*.jar" />
+ </delete>
</target>
<target name="compile">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
