diff options
136 files changed, 1154 insertions, 614 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn/about.mappings b/plugins/org.eclipse.emf.cdo.dawn/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/about.mappings +++ b/plugins/org.eclipse.emf.cdo.dawn/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.dawn/pom.xml b/plugins/org.eclipse.emf.cdo.dawn/pom.xml index 268d11da1a..067dd16f3b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/pom.xml +++ b/plugins/org.eclipse.emf.cdo.dawn/pom.xml @@ -28,4 +28,16 @@ <version>2.0.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.doc/about.mappings b/plugins/org.eclipse.emf.cdo.doc/about.mappings index 7d795dc23a..371119f585 100644 --- a/plugins/org.eclipse.emf.cdo.doc/about.mappings +++ b/plugins/org.eclipse.emf.cdo.doc/about.mappings @@ -2,4 +2,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@ +0=${build.qualifier} diff --git a/plugins/org.eclipse.emf.cdo.doc/pom.xml b/plugins/org.eclipse.emf.cdo.doc/pom.xml index 57393a44ba..4d7664ccff 100644 --- a/plugins/org.eclipse.emf.cdo.doc/pom.xml +++ b/plugins/org.eclipse.emf.cdo.doc/pom.xml @@ -39,7 +39,16 @@ </excludes> </configuration> </plugin> - </plugins> + </plugins> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> </build> </project> diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.mappings b/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.mappings +++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/pom.xml b/plugins/org.eclipse.emf.cdo.ecore.retrofit/pom.xml index 3d62e90cc9..26c9a22dfd 100644 --- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/pom.xml +++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/pom.xml @@ -28,4 +28,16 @@ <version>4.2.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/about.mappings b/plugins/org.eclipse.emf.cdo.examples.installer/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/about.mappings +++ b/plugins/org.eclipse.emf.cdo.examples.installer/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.ini b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.ini deleted file mode 100644 index 32006ae5d6..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.mappings b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.properties deleted file mode 100644 index 16de85f7ce..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Martin Fluegge - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = CDO Electronic Restaurant Example RCP -featureText = CDO Electronic Restaurant Example RCP\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://www.eclipse.org/cdo - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/build.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/build.properties index 7ba0e96c2f..6551536326 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/build.properties +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/build.properties @@ -16,11 +16,7 @@ bin.includes = plugin.xml,\ .,\ icons/,\ splash.bmp,\ - about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + about.html src.includes = about.html,\ pom.xml diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/modeling32.png b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml index 1026937995..7c28708328 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml @@ -28,4 +28,16 @@ <version>4.1.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.examples/about.mappings b/plugins/org.eclipse.emf.cdo.examples/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.examples/about.mappings +++ b/plugins/org.eclipse.emf.cdo.examples/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.examples/pom.xml b/plugins/org.eclipse.emf.cdo.examples/pom.xml index 7ed3fbe416..934740749f 100644 --- a/plugins/org.eclipse.emf.cdo.examples/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples/pom.xml @@ -28,4 +28,16 @@ <version>4.0.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.explorer/about.mappings b/plugins/org.eclipse.emf.cdo.explorer/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/about.mappings +++ b/plugins/org.eclipse.emf.cdo.explorer/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.explorer/pom.xml b/plugins/org.eclipse.emf.cdo.explorer/pom.xml index effe4e0395..6f00f0a380 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/pom.xml +++ b/plugins/org.eclipse.emf.cdo.explorer/pom.xml @@ -28,4 +28,16 @@ <version>4.5.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.migrator/about.mappings b/plugins/org.eclipse.emf.cdo.migrator/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/about.mappings +++ b/plugins/org.eclipse.emf.cdo.migrator/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.migrator/pom.xml b/plugins/org.eclipse.emf.cdo.migrator/pom.xml index 720c8bc16a..9af4de1f1e 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/pom.xml +++ b/plugins/org.eclipse.emf.cdo.migrator/pom.xml @@ -28,4 +28,16 @@ <version>3.0.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.sdk/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.sdk/META-INF/MANIFEST.MF index c510bf248e..2ad8357947 100644 --- a/plugins/org.eclipse.emf.cdo.sdk/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.sdk/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.sdk; singleton:=true -Bundle-Version: 4.1.400.qualifier +Bundle-Version: 4.1.500.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.sdk/about.mappings b/plugins/org.eclipse.emf.cdo.sdk/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.sdk/about.mappings +++ b/plugins/org.eclipse.emf.cdo.sdk/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.sdk/pom.xml b/plugins/org.eclipse.emf.cdo.sdk/pom.xml index a05d1391d0..7f69199e47 100644 --- a/plugins/org.eclipse.emf.cdo.sdk/pom.xml +++ b/plugins/org.eclipse.emf.cdo.sdk/pom.xml @@ -25,7 +25,19 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.sdk</artifactId> - <version>4.1.400-SNAPSHOT</version> + <version>4.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.db/about.mappings b/plugins/org.eclipse.emf.cdo.server.db/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.db/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.db/pom.xml b/plugins/org.eclipse.emf.cdo.server.db/pom.xml index 392db663a2..07d09f66fe 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.db/pom.xml @@ -28,4 +28,16 @@ <version>4.5.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/about.mappings b/plugins/org.eclipse.emf.cdo.server.db4o/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.db4o/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/pom.xml b/plugins/org.eclipse.emf.cdo.server.db4o/pom.xml index 16cbd7e862..d0462bed88 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.db4o/pom.xml @@ -28,4 +28,16 @@ <version>4.0.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.embedded/about.mappings b/plugins/org.eclipse.emf.cdo.server.embedded/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.embedded/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.embedded/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.embedded/pom.xml b/plugins/org.eclipse.emf.cdo.server.embedded/pom.xml index 9aadf2ee90..1547074cba 100644 --- a/plugins/org.eclipse.emf.cdo.server.embedded/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.embedded/pom.xml @@ -28,4 +28,16 @@ <version>4.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/about.mappings b/plugins/org.eclipse.emf.cdo.server.hibernate/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/pom.xml b/plugins/org.eclipse.emf.cdo.server.hibernate/pom.xml index 5535117bb6..5c5a27b31c 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/pom.xml @@ -28,4 +28,16 @@ <version>4.2.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/about.mappings b/plugins/org.eclipse.emf.cdo.server.lissome/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.lissome/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.lissome/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml b/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml index a27907f0fc..26f78aefa2 100644 --- a/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml @@ -28,4 +28,16 @@ <version>4.2.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/about.mappings b/plugins/org.eclipse.emf.cdo.server.mongodb/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml b/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml index e07beaeb3a..14edcd7a4f 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/pom.xml @@ -28,4 +28,16 @@ <version>4.0.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/about.mappings b/plugins/org.eclipse.emf.cdo.server.objectivity/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/pom.xml b/plugins/org.eclipse.emf.cdo.server.objectivity/pom.xml index dae896e509..e116546c96 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/pom.xml @@ -28,4 +28,16 @@ <version>4.0.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.server/about.mappings b/plugins/org.eclipse.emf.cdo.server/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.server/about.mappings +++ b/plugins/org.eclipse.emf.cdo.server/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server/pom.xml b/plugins/org.eclipse.emf.cdo.server/pom.xml index 1685730d47..9ac480d712 100644 --- a/plugins/org.eclipse.emf.cdo.server/pom.xml +++ b/plugins/org.eclipse.emf.cdo.server/pom.xml @@ -28,4 +28,16 @@ <version>4.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/about.mappings b/plugins/org.eclipse.emf.cdo.tests.hibernate/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/about.mappings +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml b/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml index cac1bbd489..abc1702538 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml @@ -28,4 +28,16 @@ <version>4.1.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.tests/about.mappings b/plugins/org.eclipse.emf.cdo.tests/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.tests/about.mappings +++ b/plugins/org.eclipse.emf.cdo.tests/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.tests/pom.xml b/plugins/org.eclipse.emf.cdo.tests/pom.xml index 64332e6185..13558565f3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/pom.xml +++ b/plugins/org.eclipse.emf.cdo.tests/pom.xml @@ -28,4 +28,16 @@ <version>4.0.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.transfer.repository/about.mappings b/plugins/org.eclipse.emf.cdo.transfer.repository/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.repository/about.mappings +++ b/plugins/org.eclipse.emf.cdo.transfer.repository/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.transfer.repository/pom.xml b/plugins/org.eclipse.emf.cdo.transfer.repository/pom.xml index db91bc3a88..7c7a3c69a5 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.repository/pom.xml +++ b/plugins/org.eclipse.emf.cdo.transfer.repository/pom.xml @@ -28,4 +28,16 @@ <version>4.2.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace/about.mappings b/plugins/org.eclipse.emf.cdo.transfer.workspace/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.workspace/about.mappings +++ b/plugins/org.eclipse.emf.cdo.transfer.workspace/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace/pom.xml b/plugins/org.eclipse.emf.cdo.transfer.workspace/pom.xml index 1f217d4863..c15a3c6d30 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.workspace/pom.xml +++ b/plugins/org.eclipse.emf.cdo.transfer.workspace/pom.xml @@ -28,4 +28,16 @@ <version>4.2.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo.transfer/about.mappings b/plugins/org.eclipse.emf.cdo.transfer/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo.transfer/about.mappings +++ b/plugins/org.eclipse.emf.cdo.transfer/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.transfer/pom.xml b/plugins/org.eclipse.emf.cdo.transfer/pom.xml index 0234d5900d..2ec6e7bbb0 100644 --- a/plugins/org.eclipse.emf.cdo.transfer/pom.xml +++ b/plugins/org.eclipse.emf.cdo.transfer/pom.xml @@ -28,4 +28,16 @@ <version>4.2.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.emf.cdo/about.mappings b/plugins/org.eclipse.emf.cdo/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.emf.cdo/about.mappings +++ b/plugins/org.eclipse.emf.cdo/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo/pom.xml b/plugins/org.eclipse.emf.cdo/pom.xml index 0b859c9c88..ed4b05bc71 100644 --- a/plugins/org.eclipse.emf.cdo/pom.xml +++ b/plugins/org.eclipse.emf.cdo/pom.xml @@ -28,4 +28,16 @@ <version>4.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.buddies.chat/about.ini b/plugins/org.eclipse.net4j.buddies.chat/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.buddies.chat/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.buddies.chat/about.mappings b/plugins/org.eclipse.net4j.buddies.chat/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.buddies.chat/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.buddies.chat/about.properties b/plugins/org.eclipse.net4j.buddies.chat/about.properties deleted file mode 100644 index fa24494636..0000000000 --- a/plugins/org.eclipse.net4j.buddies.chat/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2008, 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Buddies Chat -featureText = Net4j Buddies Chat\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.buddies.chat/build.properties b/plugins/org.eclipse.net4j.buddies.chat/build.properties index 493186913b..ebc736f6ec 100644 --- a/plugins/org.eclipse.net4j.buddies.chat/build.properties +++ b/plugins/org.eclipse.net4j.buddies.chat/build.properties @@ -14,11 +14,7 @@ bin.includes = .,\ plugin.properties,\ .options,\ about.html,\ - plugin.xml,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + plugin.xml jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.net4j.buddies.chat/modeling32.png b/plugins/org.eclipse.net4j.buddies.chat/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.buddies.chat/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.buddies.server/about.ini b/plugins/org.eclipse.net4j.buddies.server/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.buddies.server/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.buddies.server/about.mappings b/plugins/org.eclipse.net4j.buddies.server/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.buddies.server/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.buddies.server/about.properties b/plugins/org.eclipse.net4j.buddies.server/about.properties deleted file mode 100644 index 5cff46dee6..0000000000 --- a/plugins/org.eclipse.net4j.buddies.server/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2007-2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Buddies Server -featureText = Net4j Buddies Server\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.buddies.server/build.properties b/plugins/org.eclipse.net4j.buddies.server/build.properties index b537c67467..cef78d78ad 100644 --- a/plugins/org.eclipse.net4j.buddies.server/build.properties +++ b/plugins/org.eclipse.net4j.buddies.server/build.properties @@ -14,11 +14,7 @@ bin.includes = .,\ plugin.properties,\ .options,\ about.html,\ - plugin.xml,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + plugin.xml jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.net4j.buddies.server/modeling32.png b/plugins/org.eclipse.net4j.buddies.server/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.buddies.server/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.buddies/about.ini b/plugins/org.eclipse.net4j.buddies/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.buddies/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.buddies/about.mappings b/plugins/org.eclipse.net4j.buddies/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.buddies/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.buddies/about.properties b/plugins/org.eclipse.net4j.buddies/about.properties deleted file mode 100644 index 8f5b12dad4..0000000000 --- a/plugins/org.eclipse.net4j.buddies/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2007-2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Buddies -featureText = Net4j Buddies\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.buddies/build.properties b/plugins/org.eclipse.net4j.buddies/build.properties index 4a629be38b..1d5c90d5d8 100644 --- a/plugins/org.eclipse.net4j.buddies/build.properties +++ b/plugins/org.eclipse.net4j.buddies/build.properties @@ -13,11 +13,7 @@ bin.includes = .,\ META-INF/,\ plugin.properties,\ .options,\ - about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + about.html jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.net4j.buddies/modeling32.png b/plugins/org.eclipse.net4j.buddies/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.buddies/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.db.derby/about.mappings b/plugins/org.eclipse.net4j.db.derby/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db.derby/about.mappings +++ b/plugins/org.eclipse.net4j.db.derby/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db.derby/pom.xml b/plugins/org.eclipse.net4j.db.derby/pom.xml index c2234ea053..a79b7cd11b 100644 --- a/plugins/org.eclipse.net4j.db.derby/pom.xml +++ b/plugins/org.eclipse.net4j.db.derby/pom.xml @@ -28,4 +28,16 @@ <version>4.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.db.doc/about.mappings b/plugins/org.eclipse.net4j.db.doc/about.mappings index 7d795dc23a..371119f585 100644 --- a/plugins/org.eclipse.net4j.db.doc/about.mappings +++ b/plugins/org.eclipse.net4j.db.doc/about.mappings @@ -2,4 +2,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@ +0=${build.qualifier} diff --git a/plugins/org.eclipse.net4j.db.doc/pom.xml b/plugins/org.eclipse.net4j.db.doc/pom.xml index c4707a3d42..a2a0cd0c63 100644 --- a/plugins/org.eclipse.net4j.db.doc/pom.xml +++ b/plugins/org.eclipse.net4j.db.doc/pom.xml @@ -39,7 +39,16 @@ </excludes> </configuration> </plugin> - </plugins> + </plugins> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> </build> </project> diff --git a/plugins/org.eclipse.net4j.db.h2/about.mappings b/plugins/org.eclipse.net4j.db.h2/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db.h2/about.mappings +++ b/plugins/org.eclipse.net4j.db.h2/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db.h2/pom.xml b/plugins/org.eclipse.net4j.db.h2/pom.xml index b2854babe4..f1074b5f92 100644 --- a/plugins/org.eclipse.net4j.db.h2/pom.xml +++ b/plugins/org.eclipse.net4j.db.h2/pom.xml @@ -28,4 +28,16 @@ <version>4.3.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.db.hsqldb/about.mappings b/plugins/org.eclipse.net4j.db.hsqldb/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db.hsqldb/about.mappings +++ b/plugins/org.eclipse.net4j.db.hsqldb/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db.hsqldb/pom.xml b/plugins/org.eclipse.net4j.db.hsqldb/pom.xml index 219538de09..ade670d837 100644 --- a/plugins/org.eclipse.net4j.db.hsqldb/pom.xml +++ b/plugins/org.eclipse.net4j.db.hsqldb/pom.xml @@ -28,4 +28,16 @@ <version>4.2.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.db.mysql/about.mappings b/plugins/org.eclipse.net4j.db.mysql/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db.mysql/about.mappings +++ b/plugins/org.eclipse.net4j.db.mysql/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db.mysql/pom.xml b/plugins/org.eclipse.net4j.db.mysql/pom.xml index c00f2e148c..47d0222145 100644 --- a/plugins/org.eclipse.net4j.db.mysql/pom.xml +++ b/plugins/org.eclipse.net4j.db.mysql/pom.xml @@ -28,4 +28,16 @@ <version>4.2.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.db.oracle/about.mappings b/plugins/org.eclipse.net4j.db.oracle/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db.oracle/about.mappings +++ b/plugins/org.eclipse.net4j.db.oracle/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db.oracle/pom.xml b/plugins/org.eclipse.net4j.db.oracle/pom.xml index 11b0a0f8a3..aa106db136 100644 --- a/plugins/org.eclipse.net4j.db.oracle/pom.xml +++ b/plugins/org.eclipse.net4j.db.oracle/pom.xml @@ -28,4 +28,16 @@ <version>1.1.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.db.postgresql/about.mappings b/plugins/org.eclipse.net4j.db.postgresql/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db.postgresql/about.mappings +++ b/plugins/org.eclipse.net4j.db.postgresql/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db.postgresql/pom.xml b/plugins/org.eclipse.net4j.db.postgresql/pom.xml index 059775d8ff..2b243729ff 100644 --- a/plugins/org.eclipse.net4j.db.postgresql/pom.xml +++ b/plugins/org.eclipse.net4j.db.postgresql/pom.xml @@ -28,4 +28,16 @@ <version>4.2.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.db/about.mappings b/plugins/org.eclipse.net4j.db/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.db/about.mappings +++ b/plugins/org.eclipse.net4j.db/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.db/pom.xml b/plugins/org.eclipse.net4j.db/pom.xml index fa80a1808a..eb9ba535ce 100644 --- a/plugins/org.eclipse.net4j.db/pom.xml +++ b/plugins/org.eclipse.net4j.db/pom.xml @@ -28,4 +28,16 @@ <version>4.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.doc/about.mappings b/plugins/org.eclipse.net4j.doc/about.mappings index 7d795dc23a..371119f585 100644 --- a/plugins/org.eclipse.net4j.doc/about.mappings +++ b/plugins/org.eclipse.net4j.doc/about.mappings @@ -2,4 +2,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@ +0=${build.qualifier} diff --git a/plugins/org.eclipse.net4j.doc/pom.xml b/plugins/org.eclipse.net4j.doc/pom.xml index 92a85fd86d..11bd9a431f 100644 --- a/plugins/org.eclipse.net4j.doc/pom.xml +++ b/plugins/org.eclipse.net4j.doc/pom.xml @@ -39,7 +39,16 @@ </excludes> </configuration> </plugin> - </plugins> + </plugins> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> </build> </project> diff --git a/plugins/org.eclipse.net4j.examples.installer/about.mappings b/plugins/org.eclipse.net4j.examples.installer/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.examples.installer/about.mappings +++ b/plugins/org.eclipse.net4j.examples.installer/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.ini b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.mappings b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.properties deleted file mode 100644 index fa24494636..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2008, 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Buddies Chat -featureText = Net4j Buddies Chat\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/build.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/build.properties index 493186913b..ebc736f6ec 100644 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/build.properties +++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/build.properties @@ -14,11 +14,7 @@ bin.includes = .,\ plugin.properties,\ .options,\ about.html,\ - plugin.xml,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + plugin.xml jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/modeling32.png b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.ini b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.mappings b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.properties deleted file mode 100644 index 5cff46dee6..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2007-2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Buddies Server -featureText = Net4j Buddies Server\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/build.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/build.properties index b537c67467..cef78d78ad 100644 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/build.properties +++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/build.properties @@ -14,11 +14,7 @@ bin.includes = .,\ plugin.properties,\ .options,\ about.html,\ - plugin.xml,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + plugin.xml jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/modeling32.png b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.ini b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.mappings b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.properties deleted file mode 100644 index 8f5b12dad4..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2007-2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Buddies -featureText = Net4j Buddies\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/build.properties b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/build.properties index 4a629be38b..1d5c90d5d8 100644 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/build.properties +++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/build.properties @@ -13,11 +13,7 @@ bin.includes = .,\ META-INF/,\ plugin.properties,\ .options,\ - about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + about.html jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/modeling32.png b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.examples.installer/pom.xml b/plugins/org.eclipse.net4j.examples.installer/pom.xml index 587ec6f115..05288dc3a5 100644 --- a/plugins/org.eclipse.net4j.examples.installer/pom.xml +++ b/plugins/org.eclipse.net4j.examples.installer/pom.xml @@ -28,4 +28,16 @@ <version>4.1.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.examples/about.mappings b/plugins/org.eclipse.net4j.examples/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.examples/about.mappings +++ b/plugins/org.eclipse.net4j.examples/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.examples/pom.xml b/plugins/org.eclipse.net4j.examples/pom.xml index 2204a0e34d..4bcd2675e4 100644 --- a/plugins/org.eclipse.net4j.examples/pom.xml +++ b/plugins/org.eclipse.net4j.examples/pom.xml @@ -28,4 +28,16 @@ <version>4.0.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.sdk/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.sdk/META-INF/MANIFEST.MF index 130e03c227..9480b412c8 100644 --- a/plugins/org.eclipse.net4j.sdk/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.sdk/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.sdk; singleton:=true -Bundle-Version: 4.1.400.qualifier +Bundle-Version: 4.1.500.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.net4j.sdk/about.mappings b/plugins/org.eclipse.net4j.sdk/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.sdk/about.mappings +++ b/plugins/org.eclipse.net4j.sdk/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.sdk/pom.xml b/plugins/org.eclipse.net4j.sdk/pom.xml index c1cb9e9dc0..c38da12fd8 100644 --- a/plugins/org.eclipse.net4j.sdk/pom.xml +++ b/plugins/org.eclipse.net4j.sdk/pom.xml @@ -25,7 +25,19 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.net4j.sdk</artifactId> - <version>4.1.400-SNAPSHOT</version> + <version>4.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.tests/about.mappings b/plugins/org.eclipse.net4j.tests/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.tests/about.mappings +++ b/plugins/org.eclipse.net4j.tests/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.tests/pom.xml b/plugins/org.eclipse.net4j.tests/pom.xml index 4c08ec9159..9bc7612cad 100644 --- a/plugins/org.eclipse.net4j.tests/pom.xml +++ b/plugins/org.eclipse.net4j.tests/pom.xml @@ -28,4 +28,16 @@ <version>4.1.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.ui.shared/about.ini b/plugins/org.eclipse.net4j.ui.shared/about.ini deleted file mode 100644 index b7e87ca285..0000000000 --- a/plugins/org.eclipse.net4j.ui.shared/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.eclipse.net4j.ui.shared/about.mappings b/plugins/org.eclipse.net4j.ui.shared/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.eclipse.net4j.ui.shared/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.ui.shared/about.properties b/plugins/org.eclipse.net4j.ui.shared/about.properties deleted file mode 100644 index c492193e8a..0000000000 --- a/plugins/org.eclipse.net4j.ui.shared/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2010, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = Net4j Signalling Platform UI -featureText = Net4j Signalling Platform UI\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://wiki.eclipse.org/Net4j - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.eclipse.net4j.ui.shared/build.properties b/plugins/org.eclipse.net4j.ui.shared/build.properties index 72c866b7dc..15b918c1dd 100644 --- a/plugins/org.eclipse.net4j.ui.shared/build.properties +++ b/plugins/org.eclipse.net4j.ui.shared/build.properties @@ -16,11 +16,7 @@ bin.includes = META-INF/,\ .options,\ about.html,\ icons/,\ - plugin.properties,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + plugin.properties src.includes = about.html,\ pom.xml diff --git a/plugins/org.eclipse.net4j.ui.shared/modeling32.png b/plugins/org.eclipse.net4j.ui.shared/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.eclipse.net4j.ui.shared/modeling32.png +++ /dev/null diff --git a/plugins/org.eclipse.net4j.ui/about.mappings b/plugins/org.eclipse.net4j.ui/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j.ui/about.mappings +++ b/plugins/org.eclipse.net4j.ui/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.ui/pom.xml b/plugins/org.eclipse.net4j.ui/pom.xml index decc6cb5e3..98bcc4e2c6 100644 --- a/plugins/org.eclipse.net4j.ui/pom.xml +++ b/plugins/org.eclipse.net4j.ui/pom.xml @@ -28,4 +28,16 @@ <version>4.2.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.eclipse.net4j.util.doc/about.mappings b/plugins/org.eclipse.net4j.util.doc/about.mappings index 7d795dc23a..371119f585 100644 --- a/plugins/org.eclipse.net4j.util.doc/about.mappings +++ b/plugins/org.eclipse.net4j.util.doc/about.mappings @@ -2,4 +2,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@ +0=${build.qualifier} diff --git a/plugins/org.eclipse.net4j.util.doc/pom.xml b/plugins/org.eclipse.net4j.util.doc/pom.xml index f0944216e0..ef42c135d2 100644 --- a/plugins/org.eclipse.net4j.util.doc/pom.xml +++ b/plugins/org.eclipse.net4j.util.doc/pom.xml @@ -39,7 +39,16 @@ </excludes> </configuration> </plugin> - </plugins> + </plugins> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> </build> </project> diff --git a/plugins/org.eclipse.net4j/about.mappings b/plugins/org.eclipse.net4j/about.mappings index bddaab4310..28e3764743 100644 --- a/plugins/org.eclipse.net4j/about.mappings +++ b/plugins/org.eclipse.net4j/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j/pom.xml b/plugins/org.eclipse.net4j/pom.xml index e792bf1165..018c837252 100644 --- a/plugins/org.eclipse.net4j/pom.xml +++ b/plugins/org.eclipse.net4j/pom.xml @@ -28,4 +28,16 @@ <version>4.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/plugins/org.gastro.rcp/about.ini b/plugins/org.gastro.rcp/about.ini deleted file mode 100644 index 32006ae5d6..0000000000 --- a/plugins/org.gastro.rcp/about.ini +++ /dev/null @@ -1,15 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%featureText - -# Property "featureImage" contains path to feature image (32x32) -featureImage=modeling32.png - -# Property "appName" contains name of the application (translated) -appName=%featureName - diff --git a/plugins/org.gastro.rcp/about.mappings b/plugins/org.gastro.rcp/about.mappings deleted file mode 100644 index bddaab4310..0000000000 --- a/plugins/org.gastro.rcp/about.mappings +++ /dev/null @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@
\ No newline at end of file diff --git a/plugins/org.gastro.rcp/about.properties b/plugins/org.gastro.rcp/about.properties deleted file mode 100644 index 16de85f7ce..0000000000 --- a/plugins/org.gastro.rcp/about.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Martin Fluegge - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -featureName = CDO Electronic Restaurant Example RCP -featureText = CDO Electronic Restaurant Example RCP\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\ -\n\ -Visit http://www.eclipse.org/cdo - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/plugins/org.gastro.rcp/build.properties b/plugins/org.gastro.rcp/build.properties index 7ba0e96c2f..6551536326 100644 --- a/plugins/org.gastro.rcp/build.properties +++ b/plugins/org.gastro.rcp/build.properties @@ -16,11 +16,7 @@ bin.includes = plugin.xml,\ .,\ icons/,\ splash.bmp,\ - about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ - modeling32.png + about.html src.includes = about.html,\ pom.xml diff --git a/plugins/org.gastro.rcp/modeling32.png b/plugins/org.gastro.rcp/modeling32.png Binary files differdeleted file mode 100644 index 6b08de2ada..0000000000 --- a/plugins/org.gastro.rcp/modeling32.png +++ /dev/null diff --git a/releng/org.eclipse.emf.cdo.releng.help/about.mappings b/releng/org.eclipse.emf.cdo.releng.help/about.mappings index bddaab4310..28e3764743 100644 --- a/releng/org.eclipse.emf.cdo.releng.help/about.mappings +++ b/releng/org.eclipse.emf.cdo.releng.help/about.mappings @@ -3,4 +3,4 @@ # java.io.Properties file (ISO 8859-1 with "\" escapes) # This file does not need to be translated. -0=@build@
\ No newline at end of file +0=${build.qualifier}
\ No newline at end of file diff --git a/releng/org.eclipse.emf.cdo.releng.help/pom.xml b/releng/org.eclipse.emf.cdo.releng.help/pom.xml index a1eae85ad5..f2193349f4 100644 --- a/releng/org.eclipse.emf.cdo.releng.help/pom.xml +++ b/releng/org.eclipse.emf.cdo.releng.help/pom.xml @@ -28,4 +28,16 @@ <version>4.1.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <resources> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <includes> + <include>about.mappings</include> + </includes> + </resource> + </resources> + </build> + </project> diff --git a/releng/org.eclipse.emf.cdo.releng/build.properties b/releng/org.eclipse.emf.cdo.releng/build.properties index 8362ccc9da..dc2609dd6c 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.properties +++ b/releng/org.eclipse.emf.cdo.releng/build.properties @@ -7,31 +7,18 @@ # Contributors: # Eike Stepper - initial API and implementation -stream = 4.7 -branch = master - -train = photon -train.previous = oxygen - -eclipse = 4.8 -emf = 2.14 -weekly = I - -########################################################################### - jars.compile.order = . source.. = src/ output.. = bin/ bin.includes = .,\ META-INF/ src.includes = build.xml,\ + exampleBuilderTemplates/,\ hudson/,\ - xsl/,\ + hudson/xsl/,\ CDO.setup,\ CDOBaseline.setup,\ CDOPreNeon.setup,\ - exampleBuilderTemplates/,\ - local.properties.template,\ pom.xml,\ versions/ diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/build.properties b/releng/org.eclipse.emf.cdo.releng/hudson/build.properties new file mode 100644 index 0000000000..e506e8ff75 --- /dev/null +++ b/releng/org.eclipse.emf.cdo.releng/hudson/build.properties @@ -0,0 +1,18 @@ +# Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Eike Stepper - initial API and implementation + +stream = 4.7 +branch = master + +train = photon +train.previous = oxygen + +eclipse = 4.8 +emf = 2.14 +weekly = I diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/build.xml b/releng/org.eclipse.emf.cdo.releng/hudson/build.xml new file mode 100644 index 0000000000..d1df70f0c3 --- /dev/null +++ b/releng/org.eclipse.emf.cdo.releng/hudson/build.xml @@ -0,0 +1,483 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2011-2016 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="CDO" default="all"> + + <property file="local.properties" /> + <property file="build.properties" /> + <property environment="env" /> + + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${ant.contrib}" /> + </classpath> + </taskdef> + + <!-- ========= --> + <!-- Clean Dir --> + <!-- ========= --> + + <macrodef name="cleandir"> + <attribute name="dir" /> + <attribute name="mkdir" default="true" /> + <sequential> + <delete includeemptydirs="true" failonerror="false" verbose="false"> + <fileset dir="@{dir}" defaultexcludes="false"> + <include name="**" /> + </fileset> + </delete> + <if> + <equals arg1="@{mkdir}" arg2="true" /> + <then> + <mkdir dir="@{dir}" /> + </then> + </if> + </sequential> + </macrodef> + + <!-- ============= --> + <!-- Generate Site --> + <!-- ============= --> + + <macrodef name="generate.site"> + <attribute name="site" /> + <attribute name="todir" default="${build.root}" /> + <sequential> + <echo message="Generating site" /> + + <!-- Clean --> + <delete includeemptydirs="true" failonerror="false"> + <fileset dir="@{todir}" defaultexcludes="false"> + <include name="binary/**" /> + <include name="features/**" /> + <include name="plugins/**" /> + <include name="artifacts.jar" /> + <include name="content.jar" /> + </fileset> + </delete> + + <!-- Copy site contents --> + <copy todir="@{todir}" overwrite="true" includeemptydirs="true" preservelastmodified="true" failonerror="true"> + <fileset dir="@{site}"> + <include name="**" /> + </fileset> + </copy> + + <unzip src="${build.root}/content.jar" dest="${build.root}" /> + <replaceregexp file="${build.root}/content.xml" match="Build Local" replace="${build.qualifier}" /> + <delete file="${build.root}/content.jar" /> + <zip destfile="${build.root}/content.jar" basedir="${build.root}" file="content.xml" /> + <delete file="${build.root}/content.xml" /> + + <unzip src="${build.root}/artifacts.jar" dest="${build.root}" /> + <replaceregexp file="${build.root}/artifacts.xml" match="Build Local" replace="${build.qualifier}" /> + <delete file="${build.root}/artifacts.jar" /> + <zip destfile="${build.root}/artifacts.jar" basedir="${build.root}" file="artifacts.xml" /> + <delete file="${build.root}/artifacts.xml" /> + </sequential> + </macrodef> + + <!-- ============= --> + <!-- Generate Help --> + <!-- ============= --> + + <macrodef name="generate.help"> + <sequential> + <echo message="" /> + <echo message="Generating help center" /> + <cleandir dir="${build.root}/help" mkdir="true" /> + <copy todir="${build.root}/help"> + <fileset dir="${releng.help}/html"> + <include name="**" /> + </fileset> + <fileset dir="${releng.help}"> + <include name="docs.txt" /> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ============== --> + <!-- Generate Index --> + <!-- ============== --> + + <macrodef name="generate.index"> + <sequential> + <echo message="" /> + <echo message="Generating repository index" /> + <unzip src="${build.root}/content.jar" dest="${build.root}" /> + <property name="content.xml" location="${build.root}/content.xml" /> + <xslt style="xsl/content2html.xsl" in="${content.xml}" out="${build.root}/index.html" /> + <xslt style="xsl/content2xml.xsl" in="${content.xml}" out="${build.root}/index.xml" /> + <delete file="${content.xml}" /> + </sequential> + </macrodef> + + <!-- =================== --> + <!-- Generate Booksmarks --> + <!-- =================== --> + + <macrodef name="generate.bookmarks"> + <sequential> + <echo message="" /> + <echo message="Generating dependency bookmarks" /> + <property name="bookmarks.tmp" location="${build.root}/bookmarks.tmp" /> + <xslt style="xsl/bom2bookmarks.xsl" in="${releng.dir}/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target" out="${bookmarks.tmp}" /> + <property name="bookmarks.xml" location="${build.root}/bookmarks.xml" /> + <concat destfile="${bookmarks.xml}"> + <header filtering="false"><?xml version="1.0" encoding="UTF-8"?> +<bookmarks> +</header> + <union> + <sort> + <tokens> + <file file="${bookmarks.tmp}" /> + <linetokenizer includedelims="true" /> + </tokens> + </sort> + </union> + <filterchain> + <linecontains> + <contains value="http://" /> + </linecontains> + </filterchain> + <footer filtering="false"></bookmarks> + </footer> + </concat> + <delete file="${bookmarks.tmp}" /> + </sequential> + </macrodef> + + <!-- ================ --> + <!-- Generate Dropins --> + <!-- ================ --> + + <macrodef name="generate.dropins"> + <sequential> + <echo message="" /> + <echo message="Generating dropin archives" /> + + <mkdir dir="${zips}" /> + <zip destfile="${zips}/emf-cdo-${build.qualifier}-Dropins.zip"> + <fileset dir="${releng.site}/target/repository"> + <exclude name="**/*.pack.gz" /> + <include name="features/*.jar" /> + <include name="plugins/*.jar" /> + </fileset> + </zip> + <echo message=" for use with a <a href="http://help.eclipse.org/oxygen/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/p2_dropins_format.html">dropins</a> folder." + file="${zips}/emf-cdo-${build.qualifier}-Dropins.properties" /> + </sequential> + </macrodef> + + <!-- ============ --> + <!-- Generate API --> + <!-- ============ --> + + <macrodef name="generate.apireports"> + <sequential> + <echo message="" /> + <echo message="Generating API reports" /> + <copy file="${releng}/api/api.xml" todir="${build.root}" overwrite="true" /> + <copy file="${releng}/api/api.css" todir="${build.root}" overwrite="true" /> + <java classname="org.eclipse.emf.cdo.releng.Api2Html"> + <classpath> + <pathelement location="${releng}/target/classes/" /> + <pathelement location="/opt/public/common/apache-ant-1.7.1/lib/xercesImpl.jar" /> + </classpath> + <arg value="${build.root}" /> + <arg value="${build.qualifier}" /> + </java> + </sequential> + </macrodef> + + <!-- =========== --> + <!-- Init Hudson --> + <!-- =========== --> + + <target name="init.hudson" if="env.HUDSON_URL"> + <property name="build.root" value="${env.WORKSPACE}" /> + <property name="build.location" value="hudson" /> + <property name="build.timestamp" value="${env.BUILD_ID}" /> + <property name="loglevel" value="${env.LOG_LEVEL}" /> + <property name="skip.test" value="${env.SKIP_TEST}" /> + + <!-- build.trigger --> + <if> + <not> + <isset property="build.trigger" /> + </not> + <then> + <xmlproperty keeproot="false"> + <url url="${env.BUILD_URL}/api/xml?tree=actions[causes[shortDescription]]" /> + </xmlproperty> + <loadresource property="build.trigger"> + <propertyresource name="action.cause.shortDescription" /> + <filterchain> + <replaceregex pattern="^Triggered by " replace="" /> + <replaceregex pattern="^Gerrit: .*" replace="gerrit" /> + <replaceregex pattern="^Started by " replace="" /> + <replaceregex pattern="^Gestartet durch " replace="" /> + <replaceregex pattern="Benutzer" replace="user" /> + </filterchain> + </loadresource> + </then> + </if> + + <!-- build.type --> + <if> + <equals arg1="${env.BUILD_TYPE}" arg2="<default>" /> + <then> + <condition property="build.type" value="${weekly}" else="N"> + <equals arg1="${build.trigger}" arg2="timer" /> + </condition> + </then> + <else> + <property name="build.type" value="${env.BUILD_TYPE}" /> + </else> + </if> + </target> + + <!-- ========== --> + <!-- Init Local --> + <!-- ========== --> + + <target name="init.local" unless="env.HUDSON_URL"> + <fail unless="build.root" message="The property 'build.root' must be defined in a 'local.properties' file" /> + + <property name="build.location" value="local" /> + <property name="build.trigger" value="manual" /> + <property name="git.clone" value="${build.root}/git" /> + + <!-- build.timestamp --> + <tstamp> + <format property="build.timestamp" pattern="yyyy-MM-dd_HH-mm-ss" /> + </tstamp> + + <!-- git.clone --> + <if> + <and> + <equals arg1="${keep.git}" arg2="true" /> + <available file="${git.clone}" type="dir" /> + </and> + <then> + <echo message="Keeping Git clone" /> + </then> + <else> + <echo message="Copying Git clone from ${original.git.dir}" /> + <cleandir dir="${git.clone}" /> + <copy todir="${git.clone}"> + <fileset dir="${original.git.dir}" defaultexcludes="false"> + <exclude name="**/*.class" /> + </fileset> + </copy> + </else> + </if> + </target> + + <!-- =============== --> + <!-- Init Properties --> + <!-- =============== --> + + <target name="init.properties" depends="init.hudson,init.local"> + <condition property="no.proxy" value="${env.no_proxy}, dev.eclipse.org" else="dev.eclipse.org"> + <isset property="env.no_proxy" /> + </condition> + + <property name="git.clone" location="${build.root}/git" /> + <property name="features.dir" location="${git.clone}/features" /> + <property name="plugins.dir" location="${git.clone}/plugins" /> + <property name="releng.dir" location="${git.clone}/releng" /> + <property name="releng" location="${releng.dir}/org.eclipse.emf.cdo.releng" /> + <property name="releng.help" location="${releng.dir}/org.eclipse.emf.cdo.releng.help" /> + <property name="releng.site" location="${releng.dir}/org.eclipse.emf.cdo.releng.site" /> + <property name="test.report" location="${build.root}/test-report.xml" /> + <property name="zips" location="${build.root}/zips" /> + + <!-- build.qualifier --> + <tempfile property="build.qualifier.tmp" + destdir="${java.io.tmpdir}" + prefix="build-qualifier-" + suffix=".tmp" + deleteonexit="true" /> + <echo message="build.qualifier.date=${build.timestamp}" file="${build.qualifier.tmp}" /> + <replaceregexp file="${build.qualifier.tmp}"> + <regexp pattern="([0-9]*)-([0-9]*)-([0-9]*)_([0-9]*)-([0-9]*)-([0-9]*)" /> + <substitution expression="\1\2\3-\4\5" /> + </replaceregexp > + <property file="${build.qualifier.tmp}" /> + <property name="build.qualifier" value="${build.type}${build.qualifier.date}" /> + <property name="build.version" value="v${build.qualifier.date}" /> + + <!-- build-info.xml --> + <echoxml file="${build.root}/build-info.xml"> + <build stream="${stream}" + branch="${branch}" + train="${train}" + eclipse="${eclipse}" + emf="${emf}" + type="${build.type}" + timestamp="${build.timestamp}" + qualifier="${build.qualifier}" + trigger="${build.trigger}" + hudson="${env.HUDSON_URL}" + revision="${env.GIT_COMMIT}" + job="${env.JOB_NAME}" + number="${env.BUILD_NUMBER}" /> + </echoxml> + + <!-- Echo --> + <echo message="stream = ${stream}" /> + <echo message="branch = ${branch}" /> + <echo message="train = ${train}" /> + <echo message="build.type = ${build.type}" /> + <echo message="build.location = ${build.location}" /> + <echo message="build.trigger = ${build.trigger}" /> + <echo message="build.timestamp = ${build.timestamp}" /> + <echo message="build.qualifier = ${build.qualifier}" /> + </target> + + <!-- ===== --> + <!-- Clean --> + <!-- ===== --> + + <target name="clean" depends="init.properties" description="Imports projects and binaries"> + <if> + <not> + <equals arg1="${skip.clean}" arg2="true" /> + </not> + <then> + <!-- Cleanup build.root --> + <delete failonerror="false" includeemptydirs="true"> + <fileset dir="${build.root}" defaultexcludes="false"> + <include name="zips/**" /> + <include name="*.css" /> + <include name="*.html" /> + <include name="*.xml" /> + <include name="*.log" /> + <include name="*.txt" /> + <exclude name="build-info.xml" /> + </fileset> + </delete> + + <!-- Cleanup doc plugins --> + <delete failonerror="false" includeemptydirs="true"> + <fileset dir="${plugins.dir}"> + <include name="*.doc/bin/**" /> + <include name="*.help/bin/**" /> + </fileset> + </delete> + + <!-- Initialize test report --> + <copy file="${releng}/hudson/test-report-empty.xml" tofile="${test.report}" overwrite="true" verbose="true" /> + </then> + </if> + </target> + + <!-- ==== --> + <!-- Test --> + <!-- ==== --> + + <target name="test" depends="clean" description="Runs the tests"> + <if> + <equals arg1="${skip.test}" arg2="true" /> + <then> + <echo message="Skipping test" /> + </then> + <else> + <condition property="launch.config" + value="org.eclipse.emf.cdo.tests.all/CDO GerritTests" + else="org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 ALL)"> + <isset property="GERRIT_CHANGE_ID" /> + </condition> + <echo message="Running ${launch.config}" /> + </else> + </if> + </target> + + <!-- ======== --> + <!-- Generate --> + <!-- ======== --> + + <target name="generate" depends="clean" description="Generates the site and other artifacts"> + <if> + <or> + <isset property="GERRIT_CHANGE_ID" /> + <equals arg1="${skip.generate}" arg2="true" /> + </or> + <then> + <echo message="Skipping generate" /> + </then> + <else> + <if> + <not> + <equals arg1="${skip.generate.site}" arg2="true" /> + </not> + <then> + <generate.site site="${releng.site}/target/repository" /> + </then> + </if> + + <if> + <not> + <equals arg1="${skip.generate.help}" arg2="true" /> + </not> + <then> + <generate.help /> + </then> + </if> + + <if> + <not> + <equals arg1="${skip.generate.index}" arg2="true" /> + </not> + <then> + <generate.index /> + </then> + </if> + + <if> + <not> + <equals arg1="${skip.generate.bookmarks}" arg2="true" /> + </not> + <then> + <generate.bookmarks /> + </then> + </if> + + <if> + <not> + <equals arg1="${skip.generate.dropins}" arg2="true" /> + </not> + <then> + <generate.dropins /> + </then> + </if> + + <if> + <not> + <equals arg1="${skip.generate.apireports}" arg2="true" /> + </not> + <then> + <generate.apireports /> + </then> + </if> + </else> + </if> + </target> + + <!-- === --> + <!-- All --> + <!-- === --> + + <target name="all" depends="test,generate" description="Runs the tests and generates the site and other artifacts" /> + +</project> diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/check-commit-message.ant b/releng/org.eclipse.emf.cdo.releng/hudson/check-commit-message.ant new file mode 100644 index 0000000000..9a756ad638 --- /dev/null +++ b/releng/org.eclipse.emf.cdo.releng/hudson/check-commit-message.ant @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="check-commit-message" default="check-commit-message"> + + <property environment="env" /> + + <target name="check-commit-message" if="GERRIT_CHANGE_SUBJECT"> + <condition property="commit.msg.ok" value="true"> + <matches pattern="^\[[1-9][0-9]*\] .*$" string="${GERRIT_CHANGE_SUBJECT}"/> + </condition> + <fail message="The commit message is not of the form '[bug-id] bug-subject'." unless="commit.msg.ok"/> + </target> + +</project> diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/init-properties.ant b/releng/org.eclipse.emf.cdo.releng/hudson/init-properties.ant new file mode 100644 index 0000000000..a25d81fc7c --- /dev/null +++ b/releng/org.eclipse.emf.cdo.releng/hudson/init-properties.ant @@ -0,0 +1,116 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2017 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="init-properties" default="init-properties"> + + <property file="build.properties" /> + <property environment="env" /> + + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${ant.contrib}" /> + </classpath> + </taskdef> + + <target name="init-properties" if="env.HUDSON_URL"> + <property name="build.root" value="${env.WORKSPACE}" /> + <property name="git.clone" location="${build.root}/git" /> + <property name="features.dir" location="${git.clone}/features" /> + <property name="plugins.dir" location="${git.clone}/plugins" /> + <property name="releng.dir" location="${git.clone}/releng" /> + <property name="releng" location="${releng.dir}/org.eclipse.emf.cdo.releng" /> + <property name="releng.help" location="${releng.dir}/org.eclipse.emf.cdo.releng.help" /> + <property name="releng.site" location="${releng.dir}/org.eclipse.emf.cdo.releng.site" /> + <property name="test.report" location="${build.root}/test-report.xml" /> + <property name="zips" location="${build.root}/zips" /> + + <!-- build.trigger --> + <if> + <not> + <isset property="build.trigger" /> + </not> + <then> + <xmlproperty keeproot="false"> + <url url="${env.BUILD_URL}/api/xml?tree=actions[causes[shortDescription]]" /> + </xmlproperty> + <loadresource property="build.trigger"> + <propertyresource name="action.cause.shortDescription" /> + <filterchain> + <replaceregex pattern="^Triggered by " replace="" /> + <replaceregex pattern="^Gerrit: .*" replace="gerrit" /> + <replaceregex pattern="^Started by " replace="" /> + <replaceregex pattern="^Gestartet durch " replace="" /> + <replaceregex pattern="Benutzer" replace="user" /> + </filterchain> + </loadresource> + </then> + </if> + + <!-- build.type --> + <if> + <equals arg1="${env.BUILD_TYPE}" arg2="<default>" /> + <then> + <condition property="build.type" value="${weekly}" else="N"> + <equals arg1="${build.trigger}" arg2="timer" /> + </condition> + </then> + <else> + <property name="build.type" value="${env.BUILD_TYPE}" /> + </else> + </if> + + <!-- build.qualifier --> + <property name="build.timestamp" value="${env.BUILD_ID}" /> + <tempfile property="tmp.build.qualifier" + destdir="${java.io.tmpdir}" + prefix="build-qualifier-" + suffix=".tmp" + deleteonexit="true" /> + <echo message="build.qualifier.date=${build.timestamp}" file="${tmp.build.qualifier}" /> + <replaceregexp file="${tmp.build.qualifier}"> + <regexp pattern="([0-9]*)-([0-9]*)-([0-9]*)_([0-9]*)-([0-9]*)-([0-9]*)" /> + <substitution expression="\1\2\3-\4\5" /> + </replaceregexp > + <property file="${tmp.build.qualifier}" /> + <property name="build.qualifier" value="${build.type}${build.qualifier.date}" /> + <property name="build.version" value="v${build.qualifier.date}" /> + + <!-- build-info.xml --> + <echoxml file="${env.WORKSPACE}/build-info.xml"> + <build stream="${stream}" + branch="${branch}" + train="${train}" + eclipse="${eclipse}" + emf="${emf}" + type="${build.type}" + timestamp="${build.timestamp}" + qualifier="${build.qualifier}" + trigger="${build.trigger}" + hudson="${env.HUDSON_URL}" + revision="${env.GIT_COMMIT}" + job="${env.JOB_NAME}" + number="${env.BUILD_NUMBER}" /> + </echoxml> + + <!-- build-info.properties --> + <echoproperties prefix="build." destfile="${env.WORKSPACE}/build-info.properties" /> + + <!-- Echo --> + <echo message="stream = ${stream}" /> + <echo message="branch = ${branch}" /> + <echo message="train = ${train}" /> + <echo message="build.type = ${build.type}" /> + <echo message="build.trigger = ${build.trigger}" /> + <echo message="build.timestamp = ${build.timestamp}" /> + <echo message="build.qualifier = ${build.qualifier}" /> + </target> + +</project> diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/org.eclipse.core.net.prefs b/releng/org.eclipse.emf.cdo.releng/hudson/org.eclipse.core.net.prefs deleted file mode 100644 index a92b9d5aed..0000000000 --- a/releng/org.eclipse.emf.cdo.releng/hudson/org.eclipse.core.net.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -nonProxiedHosts=*.eclipse.org|localhost|127.0.0.1 -org.eclipse.core.net.hasMigrated=true -proxyData/HTTP/hasAuth=false -proxyData/HTTP/host=proxy.eclipse.org -proxyData/HTTP/port=9898 -systemProxiesEnabled=false diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml b/releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml deleted file mode 100644 index 4246917f77..0000000000 --- a/releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml +++ /dev/null @@ -1,3 +0,0 @@ -<testsuite name="CDO AllTests" tests="1" errors="0" failures="0" ignored="0"> - <testcase name="noTestHasBeenExecuted" classname="org.eclipse.emf.cdo.tests.NoTest" time="0.00"/> -</testsuite> diff --git a/releng/org.eclipse.emf.cdo.releng/xsl/bom2bookmarks.xsl b/releng/org.eclipse.emf.cdo.releng/hudson/xsl/bom2bookmarks.xsl index e55688b3ef..e55688b3ef 100644 --- a/releng/org.eclipse.emf.cdo.releng/xsl/bom2bookmarks.xsl +++ b/releng/org.eclipse.emf.cdo.releng/hudson/xsl/bom2bookmarks.xsl diff --git a/releng/org.eclipse.emf.cdo.releng/xsl/content2html.xsl b/releng/org.eclipse.emf.cdo.releng/hudson/xsl/content2html.xsl index ea1bddcdfc..ea1bddcdfc 100644 --- a/releng/org.eclipse.emf.cdo.releng/xsl/content2html.xsl +++ b/releng/org.eclipse.emf.cdo.releng/hudson/xsl/content2html.xsl diff --git a/releng/org.eclipse.emf.cdo.releng/xsl/content2xml.xsl b/releng/org.eclipse.emf.cdo.releng/hudson/xsl/content2xml.xsl index 40ba607dff..40ba607dff 100644 --- a/releng/org.eclipse.emf.cdo.releng/xsl/content2xml.xsl +++ b/releng/org.eclipse.emf.cdo.releng/hudson/xsl/content2xml.xsl diff --git a/releng/org.eclipse.emf.cdo.releng/local.properties.template b/releng/org.eclipse.emf.cdo.releng/local.properties.template deleted file mode 100644 index 975942f421..0000000000 --- a/releng/org.eclipse.emf.cdo.releng/local.properties.template +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -ant.contrib = C:/develop/bin/ant-contrib/ant-contrib-1.0b3.jar -original.git.dir = C:/develop/cdo/master/git/cdo -build.root = C:/develop/cdo/master/build - -build.type = N -loglevel = INFO - -# Set the following properties to true to speed up repeated builds -keep.git = false - -skip.clean = false -skip.test = false -skip.generate = false - -skip.generate = false -skip.generate.site = false -skip.generate.help = false -skip.generate.index = false -skip.generate.dropins = false -skip.generate.bookmarks =false |
