Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 181428 Details for
Bug 324151
[New Assembly directive] Check box option to assemble projects into WEB-INF/lib is confusing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch v1
Patch324151v1.txt (text/plain), 18.25 KB, created by
Konstantin Komissarchik
on 2010-10-21 14:10:04 EDT
(
hide
)
Description:
Patch v1
Filename:
MIME Type:
Creator:
Konstantin Komissarchik
Created:
2010-10-21 14:10:04 EDT
Size:
18.25 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jst.servlet.ui >Index: .settings/org.eclipse.jdt.core.prefs >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs,v >retrieving revision 1.3 >diff -u -r1.3 org.eclipse.jdt.core.prefs >--- .settings/org.eclipse.jdt.core.prefs 9 Jun 2009 19:29:08 -0000 1.3 >+++ .settings/org.eclipse.jdt.core.prefs 21 Oct 2010 18:07:55 -0000 >@@ -1,95 +1,98 @@ >-#Mon Jun 08 15:35:45 EDT 2009 >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled >-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error >-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error >-org.eclipse.jdt.core.compiler.problem.unusedLocal=error >-org.eclipse.jdt.core.compiler.problem.emptyStatement=error >-org.eclipse.jdt.core.compiler.problem.unusedLabel=error >-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning >-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning >-org.eclipse.jdt.core.incompatibleJDKLevel=ignore >-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error >-org.eclipse.jdt.core.compiler.debug.lineNumber=generate >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning >+#Thu Oct 21 11:04:21 PDT 2010 >+eclipse.preferences.version=1 >+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true > org.eclipse.jdt.core.builder.cleanOutputFolder=clean >-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning >-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error >-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled >-org.eclipse.jdt.core.compiler.problem.deprecation=warning >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled >-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error >-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled >-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error >-org.eclipse.jdt.core.compiler.problem.unusedImport=error >+org.eclipse.jdt.core.builder.duplicateResourceTask=warning >+org.eclipse.jdt.core.builder.invalidClasspath=abort > org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore > org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch >+org.eclipse.jdt.core.circularClasspath=error >+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled > org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled >-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled >-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error >-org.eclipse.jdt.core.builder.invalidClasspath=abort >-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning >-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error >-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error >-org.eclipse.jdt.core.codeComplete.argumentSuffixes= > org.eclipse.jdt.core.codeComplete.argumentPrefixes= >-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore >-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error >+org.eclipse.jdt.core.codeComplete.argumentSuffixes= >+org.eclipse.jdt.core.codeComplete.fieldPrefixes= >+org.eclipse.jdt.core.codeComplete.fieldSuffixes= >+org.eclipse.jdt.core.codeComplete.localPrefixes= >+org.eclipse.jdt.core.codeComplete.localSuffixes= >+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= >+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= > org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled >-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning >-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error >-org.eclipse.jdt.core.compiler.problem.nullReference=error >-org.eclipse.jdt.core.compiler.source=1.5 >+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 >+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve >+org.eclipse.jdt.core.compiler.compliance=1.5 >+org.eclipse.jdt.core.compiler.debug.lineNumber=generate >+org.eclipse.jdt.core.compiler.debug.localVariable=generate >+org.eclipse.jdt.core.compiler.debug.sourceFile=generate >+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >+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.comparingIdentical=error >+org.eclipse.jdt.core.compiler.problem.deadCode=error >+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=error > org.eclipse.jdt.core.compiler.problem.enumIdentifier=error >-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore >-org.eclipse.jdt.core.builder.duplicateResourceTask=warning >-org.eclipse.jdt.core.compiler.problem.fieldHiding=error >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled >-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error >-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error >-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error >+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error >+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled >+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning >+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning > org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error >-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning >-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled >-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error >-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning >-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore >+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error >+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error >+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error > org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error >-eclipse.preferences.version=1 >-org.eclipse.jdt.core.incompleteClasspath=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error >-org.eclipse.jdt.core.compiler.problem.deadCode=error >-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled >-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled >-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error >-org.eclipse.jdt.core.compiler.debug.sourceFile=generate >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled >+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore >+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning >+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error > org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning >-org.eclipse.jdt.core.codeComplete.fieldPrefixes= >-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error >-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 >-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error >-org.eclipse.jdt.core.compiler.problem.autoboxing=warning >-org.eclipse.jdt.core.circularClasspath=error >-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning >+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error >+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error >+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled >+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error >+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error >+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error >+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error > org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error >-org.eclipse.jdt.core.codeComplete.fieldSuffixes= >-org.eclipse.jdt.core.codeComplete.localSuffixes= >+org.eclipse.jdt.core.compiler.problem.nullReference=error >+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error > org.eclipse.jdt.core.compiler.problem.parameterAssignment=error >+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error >+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error >+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning >+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error >+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error >+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled > org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error >-org.eclipse.jdt.core.codeComplete.localPrefixes= >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled >-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error >-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error >-org.eclipse.jdt.core.compiler.compliance=1.5 >-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled >-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= >-org.eclipse.jdt.core.compiler.debug.localVariable=generate >-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning >-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true >-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error >-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve >+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled >+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled >+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore >+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error > org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning >+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning >+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning >+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error >+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error >+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore >+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning >+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled >+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled >+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled > org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled >-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= >+org.eclipse.jdt.core.compiler.problem.unusedImport=error >+org.eclipse.jdt.core.compiler.problem.unusedLabel=error >+org.eclipse.jdt.core.compiler.problem.unusedLocal=error >+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore >+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning >+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled >+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled >+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled >+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error >+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning >+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error >+org.eclipse.jdt.core.compiler.source=1.5 >+org.eclipse.jdt.core.incompatibleJDKLevel=ignore >+org.eclipse.jdt.core.incompleteClasspath=error >Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java,v >retrieving revision 1.11 >diff -u -r1.11 CustomWebProjectReferenceWizardFragment.java >--- servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java 26 Aug 2010 19:12:58 -0000 1.11 >+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java 21 Oct 2010 18:07:55 -0000 >@@ -1,5 +1,5 @@ > /****************************************************************************** >- * Copyright (c) 2009 Red Hat and Others >+ * Copyright (c) 2010, 2009 Red Hat 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 >@@ -10,6 +10,7 @@ > * Chuck Bridgham - Ongoing improvements > * Konstantin Komissarchik - misc. UI cleanup > ******************************************************************************/ >+ > package org.eclipse.jst.servlet.ui.internal; > > import org.eclipse.core.resources.IProject; >@@ -18,85 +19,11 @@ > import org.eclipse.jst.j2ee.internal.J2EEConstants; > import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; > import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; >-import org.eclipse.swt.SWT; >-import org.eclipse.swt.events.SelectionEvent; >-import org.eclipse.swt.events.SelectionListener; >-import org.eclipse.swt.layout.GridData; >-import org.eclipse.swt.layout.GridLayout; >-import org.eclipse.swt.widgets.Button; >-import org.eclipse.swt.widgets.Composite; >-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; > import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment; >-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle; > import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants; > > public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWizardFragment { > >- public CustomWebProjectReferenceWizardFragment() { >- super(); >- } >- >- private boolean isWebLib = true; >- private Button button; >- >- @Override >- public Composite createComposite(Composite parent, IWizardHandle handle) { >- >- Composite c = new Composite(parent, SWT.NONE); >- >- final GridLayout gl = new GridLayout(); >- gl.marginWidth = 0; >- gl.marginHeight = 0; >- >- c.setLayout(gl); >- >- Composite tableComp = super.createComposite(c, handle); >- tableComp.setLayoutData(new GridData(GridData.FILL_BOTH)); >- >- // make button >- button = new Button(c, SWT.CHECK); >- button.setText(Messages.CustomWebProjectReferenceWizardFragment); >- >- final GridData gd = new GridData(); >- gd.horizontalIndent = 5; >- button.setLayoutData(gd); >- >- button.addSelectionListener(new SelectionListener() { >- public void widgetDefaultSelected(SelectionEvent e) { >- } >- public void widgetSelected(SelectionEvent e) { >- handleEdit(); >- } >- }); >- button.setSelection(true); >- >- return c; >- } >- >- public Composite createTableColumnComposite(Composite parent) { >- Composite aButtonColumn = new Composite(parent, SWT.NONE); >- >- GridLayout layout = new GridLayout(); >- layout.numColumns = 1; >- layout.marginHeight = 0; >- layout.marginWidth = 0; >- aButtonColumn.setLayout(layout); >- GridData data = new GridData(GridData.FILL_BOTH); >- //data.minimumHeight = 500; >- //data.minimumWidth = 400; >- aButtonColumn.setLayoutData(data); >- return aButtonColumn; >- } >- >- protected void handleEdit() { >- isWebLib = button.getSelection(); >- } >- >- @Override >- protected String getArchiveName(IProject proj, IVirtualComponent comp) { >- return super.getArchiveName(proj, comp); >- } >- > @Override > public void performFinish(IProgressMonitor monitor) throws CoreException { > for (int i = 0; i < selected.length; i++) { >@@ -104,9 +31,7 @@ > if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$ > J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null); > } >- String location = "/"; //$NON-NLS-1$ >- if(isWebLib) location += J2EEConstants.WEB_INF_LIB; >- getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, location); >+ getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, "/" + J2EEConstants.WEB_INF_LIB); //$NON-NLS-1$ > super.performFinish(monitor); > } > >Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java,v >retrieving revision 1.4 >diff -u -r1.4 Messages.java >--- servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java 26 Aug 2010 19:12:58 -0000 1.4 >+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java 21 Oct 2010 18:07:55 -0000 >@@ -10,7 +10,6 @@ > public static String DeploymentAssembly; > public static String WebDeploymentAssembly; > public static String ManifestEntries; >- public static String CustomWebProjectReferenceWizardFragment; > > static { > // initialize resource bundle >Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties,v >retrieving revision 1.7 >diff -u -r1.7 messages.properties >--- servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties 26 Aug 2010 19:12:58 -0000 1.7 >+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties 21 Oct 2010 18:07:55 -0000 >@@ -1,4 +1,3 @@ >-CustomWebProjectReferenceWizardFragment=Assemble projects into the &WEB-INF/lib folder of the web application > DeploymentAssembly=Deployment Assembly > WebDeploymentAssembly=Web Deployment Assembly > ManifestEntries=Manifest Entries
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 324151
: 181428