From fdb890085bc1fd3f4cc15f89c7c0aa2fa6cda0ec Mon Sep 17 00:00:00 2001 From: nash Date: Sun, 14 Nov 2010 21:45:57 +0000 Subject: Merge r1035067 TUSCANY-3762: Move filtered resources into new filtered-resources directory git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035079 13f79535-47bb-0310-9956-ffa450edef68 --- .../eclipse/plugins/core/META-INF/MANIFEST.MF | 31 ------------- .../trunk/tools/eclipse/plugins/core/about.ini | 32 ------------- .../tools/eclipse/plugins/core/about_files/NOTICE | 6 --- .../core/filtered-resources/META-INF/MANIFEST.MF | 31 +++++++++++++ .../plugins/core/filtered-resources/about.ini | 32 +++++++++++++ .../core/filtered-resources/about_files/NOTICE | 6 +++ .../org/apache/tuscany/sca/core/feature.version | 1 + .../org/apache/tuscany/sca/core/feature.version | 1 - .../trunk/tools/eclipse/plugins/core/pom.xml | 53 +++++++++++++++++++--- 9 files changed, 117 insertions(+), 76 deletions(-) delete mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/META-INF/MANIFEST.MF delete mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/about.ini delete mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/about_files/NOTICE create mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF create mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about.ini create mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE create mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version delete mode 100644 sca-java-1.x/trunk/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version (limited to 'sca-java-1.x/trunk/tools/eclipse/plugins') diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/tools/eclipse/plugins/core/META-INF/MANIFEST.MF deleted file mode 100644 index df88abf138..0000000000 --- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Apache Tuscany SCA Eclipse Tools Core -Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true -Bundle-Version: ${tuscany.eclipse.version} -Import-Package: org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.core.runtime.jobs, - org.eclipse.debug.core, - org.eclipse.debug.core.model, - org.eclipse.debug.ui, - org.eclipse.debug.ui.sourcelookup, - org.eclipse.jdt.core, - org.eclipse.jdt.debug.ui.launchConfigurations, - org.eclipse.jdt.launching, - org.eclipse.jdt.ui.wizards, - org.eclipse.jface.dialogs, - org.eclipse.jface.operation, - org.eclipse.jface.resource, - org.eclipse.jface.viewers, - org.eclipse.jface.wizard, - org.eclipse.osgi.service.datalocation;version="1.0.0", - org.eclipse.swt, - org.eclipse.swt.graphics, - org.eclipse.swt.widgets, - org.eclipse.ui, - org.eclipse.ui.progress, - org.osgi.framework;version="1.3.0" -Bundle-Vendor: Apache Software Foundation -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.ui.ide diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/about.ini b/sca-java-1.x/trunk/tools/eclipse/plugins/core/about.ini deleted file mode 100644 index 40f7cb3437..0000000000 --- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/about.ini +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -aboutText=Apache Tuscany SCA Eclipse Tools Core\n\ -\n\ -Copyright (c) 2005 - 2010 The Apache Software Foundation\n\ -Visit http://tuscany.apache.org/\n\ -\n\ -This product includes software developed by The Apache Software Foundation http://www.apache.org/\n\ -\n\ -Apache Tuscany SCA for Java includes a number of subcomponents with separate copyright notices and license\n\ -terms. Your use of these subcomponents is subject to the terms and conditions of the licenses shown at\n\ -http://www.apache.org/dist/tuscany/java/sca/${pom.version}/tuscany-sca-${pom.version}-updatesite/LICENSE - -aboutImage=icons/tuscany.gif -windowImage=icons/t.gif -featureImage=icons/t.gif diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/about_files/NOTICE b/sca-java-1.x/trunk/tools/eclipse/plugins/core/about_files/NOTICE deleted file mode 100644 index ad2ba40961..0000000000 --- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/about_files/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2010 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..df88abf138 --- /dev/null +++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF @@ -0,0 +1,31 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Apache Tuscany SCA Eclipse Tools Core +Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true +Bundle-Version: ${tuscany.eclipse.version} +Import-Package: org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.core.runtime.jobs, + org.eclipse.debug.core, + org.eclipse.debug.core.model, + org.eclipse.debug.ui, + org.eclipse.debug.ui.sourcelookup, + org.eclipse.jdt.core, + org.eclipse.jdt.debug.ui.launchConfigurations, + org.eclipse.jdt.launching, + org.eclipse.jdt.ui.wizards, + org.eclipse.jface.dialogs, + org.eclipse.jface.operation, + org.eclipse.jface.resource, + org.eclipse.jface.viewers, + org.eclipse.jface.wizard, + org.eclipse.osgi.service.datalocation;version="1.0.0", + org.eclipse.swt, + org.eclipse.swt.graphics, + org.eclipse.swt.widgets, + org.eclipse.ui, + org.eclipse.ui.progress, + org.osgi.framework;version="1.3.0" +Bundle-Vendor: Apache Software Foundation +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.ui.ide diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about.ini b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about.ini new file mode 100644 index 0000000000..40f7cb3437 --- /dev/null +++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about.ini @@ -0,0 +1,32 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +aboutText=Apache Tuscany SCA Eclipse Tools Core\n\ +\n\ +Copyright (c) 2005 - 2010 The Apache Software Foundation\n\ +Visit http://tuscany.apache.org/\n\ +\n\ +This product includes software developed by The Apache Software Foundation http://www.apache.org/\n\ +\n\ +Apache Tuscany SCA for Java includes a number of subcomponents with separate copyright notices and license\n\ +terms. Your use of these subcomponents is subject to the terms and conditions of the licenses shown at\n\ +http://www.apache.org/dist/tuscany/java/sca/${pom.version}/tuscany-sca-${pom.version}-updatesite/LICENSE + +aboutImage=icons/tuscany.gif +windowImage=icons/t.gif +featureImage=icons/t.gif diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE new file mode 100644 index 0000000000..ad2ba40961 --- /dev/null +++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE @@ -0,0 +1,6 @@ +${pom.name} +Copyright (c) 2005 - 2010 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version new file mode 100644 index 0000000000..6bcf8a724b --- /dev/null +++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version @@ -0,0 +1 @@ +${tuscany.eclipse.version} diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version b/sca-java-1.x/trunk/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version deleted file mode 100644 index 6bcf8a724b..0000000000 --- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version +++ /dev/null @@ -1 +0,0 @@ -${tuscany.eclipse.version} diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml index 95298067c1..f33c744cc4 100644 --- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml +++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml @@ -68,25 +68,48 @@ - - ../../target/filter.properties - - ${basedir} - true src/** **/.*/** pom.xml build.* + filtered-resources/** target/** - + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + + + copy-filtered-resources + generate-resources + + copy-resources + + + ${basedir} + + ${basedir}/../../target/filter.properties + + + + ${basedir}/filtered-resources + true + + + + + + org.apache.maven.plugins maven-jar-plugin @@ -96,6 +119,24 @@ + + org.apache.maven.plugins + maven-clean-plugin + + + + + ${basedir} + + about.ini + about_files/NOTICE + META-INF/MANIFEST.MF + org/apache/tuscany/sca/core/feature.version + + + + + -- cgit v1.2.3