From b150f98526bbd41af30a6f5f7f20916165448e65 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 22 Mar 2007 15:50:57 +0000 Subject: [PATCH] Set EE J2SE-1.4, add .qualifier, externalize providerName, fix about.html and build.properties --- .../org.eclipse.rse.importexport/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 70 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 7 +- .../org.eclipse.rse.importexport/about.html | 32 ++++----- .../build.properties | 6 +- .../plugin.properties | 4 +- .../org.eclipse.rse.useractions/.classpath | 8 +-- .../.settings/org.eclipse.jdt.core.prefs | 70 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 7 +- .../org.eclipse.rse.useractions/about.html | 32 ++++----- .../build.properties | 4 +- .../plugin.properties | 4 +- 12 files changed, 194 insertions(+), 52 deletions(-) create mode 100644 rse/plugins/org.eclipse.rse.importexport/.settings/org.eclipse.jdt.core.prefs create mode 100644 rse/plugins/org.eclipse.rse.useractions/.settings/org.eclipse.jdt.core.prefs diff --git a/rse/plugins/org.eclipse.rse.importexport/.classpath b/rse/plugins/org.eclipse.rse.importexport/.classpath index 751c8f2e504..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.importexport/.classpath +++ b/rse/plugins/org.eclipse.rse.importexport/.classpath @@ -1,7 +1,7 @@ - + diff --git a/rse/plugins/org.eclipse.rse.importexport/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.importexport/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..d141d33956c --- /dev/null +++ b/rse/plugins/org.eclipse.rse.importexport/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,70 @@ +#Tue Jan 30 22:33:44 CET 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF index 85fc05b354a..e57a648e98e 100644 --- a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin.name +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.importexport; singleton:=true -Bundle-Version: 2.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: systemsImportExport.jar Bundle-Activator: org.eclipse.rse.importexport.RemoteImportExportPlugin -Bundle-Vendor: Eclipse.org +Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.rse.files.importexport, org.eclipse.rse.files.importexport.files, @@ -21,3 +21,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.files.ui Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.importexport/about.html b/rse/plugins/org.eclipse.rse.importexport/about.html index e8ed9d8aad1..460233046ee 100644 --- a/rse/plugins/org.eclipse.rse.importexport/about.html +++ b/rse/plugins/org.eclipse.rse.importexport/about.html @@ -8,23 +8,21 @@

About This Content

-

June 5, 2006

+

June 2, 2006

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the -terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). -A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content. -

-

-If you did not receive this Content directly from the Eclipse Foundation, -the Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. -If no such license exists, contact the Redistributor. -Unless otherwise indicated below, the terms and conditions of the EPL still -apply to any source code in the Content and such source code may be obtained -at http://www.eclipse.org. -

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.importexport/build.properties b/rse/plugins/org.eclipse.rse.importexport/build.properties index db91518b1d5..d38595388cd 100644 --- a/rse/plugins/org.eclipse.rse.importexport/build.properties +++ b/rse/plugins/org.eclipse.rse.importexport/build.properties @@ -7,6 +7,7 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Martin Oberhuber (Wind River) - remove branding plugin files ############################################################################### source.systemsImportExport.jar = src/ output.systemsImportExport.jar = bin/ @@ -15,8 +16,5 @@ bin.includes = plugin.xml,\ plugin.properties,\ icons/,\ about.html,\ - about.properties,\ - about.ini,\ - wsFeat.gif,\ - about.html,\ META-INF/ +src.includes = about.html diff --git a/rse/plugins/org.eclipse.rse.importexport/plugin.properties b/rse/plugins/org.eclipse.rse.importexport/plugin.properties index 0e7dc532c16..fba6bb1c986 100644 --- a/rse/plugins/org.eclipse.rse.importexport/plugin.properties +++ b/rse/plugins/org.eclipse.rse.importexport/plugin.properties @@ -7,13 +7,15 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Martin Oberhuber (Wind River) - add providerName ############################################################################### # NLS_MESSAGEFORMAT_NONE # NLS_ENCODING=UTF-8 # Plugin name -plugin.name = RSE Import/Export +pluginName = RSE Import/Export +providerName = Eclipse.org # Remote file import and export wizards RemoteFileSystemExportWizard.label = Remote file system diff --git a/rse/plugins/org.eclipse.rse.useractions/.classpath b/rse/plugins/org.eclipse.rse.useractions/.classpath index 7398f97e2d0..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.useractions/.classpath +++ b/rse/plugins/org.eclipse.rse.useractions/.classpath @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/rse/plugins/org.eclipse.rse.useractions/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.useractions/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..d141d33956c --- /dev/null +++ b/rse/plugins/org.eclipse.rse.useractions/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,70 @@ +#Tue Jan 30 22:33:44 CET 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF index f1d9aa8cb1f..cb67c52a709 100644 --- a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin.name +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.useractions;singleton:=true -Bundle-Version: 2.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.rse.useractions.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, @@ -29,4 +29,5 @@ Export-Package: org.eclipse.rse.useractions, org.eclipse.rse.useractions.ui.uda, org.eclipse.rse.useractions.ui.uda.actions, org.eclipse.rse.useractions.ui.uda.util -Bundle-Vendor: Eclipse.org +Bundle-Vendor: %providerName +Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.useractions/about.html b/rse/plugins/org.eclipse.rse.useractions/about.html index e8ed9d8aad1..460233046ee 100644 --- a/rse/plugins/org.eclipse.rse.useractions/about.html +++ b/rse/plugins/org.eclipse.rse.useractions/about.html @@ -8,23 +8,21 @@

About This Content

-

June 5, 2006

+

June 2, 2006

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). -Unless otherwise indicated below, the Content is provided to you under the -terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). -A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content. -

-

-If you did not receive this Content directly from the Eclipse Foundation, -the Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. -If no such license exists, contact the Redistributor. -Unless otherwise indicated below, the terms and conditions of the EPL still -apply to any source code in the Content and such source code may be obtained -at http://www.eclipse.org. -

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.useractions/build.properties b/rse/plugins/org.eclipse.rse.useractions/build.properties index c2b9e0b19e0..e3f82328077 100644 --- a/rse/plugins/org.eclipse.rse.useractions/build.properties +++ b/rse/plugins/org.eclipse.rse.useractions/build.properties @@ -14,4 +14,6 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/,\ - plugin.properties + plugin.properties,\ + about.html +src.includes = about.html diff --git a/rse/plugins/org.eclipse.rse.useractions/plugin.properties b/rse/plugins/org.eclipse.rse.useractions/plugin.properties index f8be0756925..f8ce3a3dde7 100644 --- a/rse/plugins/org.eclipse.rse.useractions/plugin.properties +++ b/rse/plugins/org.eclipse.rse.useractions/plugin.properties @@ -7,9 +7,11 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Martin Oberhuber (Wind River) - add providerName ############################################################################### # NLS_MESSAGEFORMAT_NONE # NLS_ENCODING=UTF-8 -plugin.name = RSE User Actions +pluginName = RSE User Actions +providerName = Eclipse.org