Attachment #179347 for bug #325911

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 325911
Collapse All | Expand All




import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;

			super.handleAddDirective(wizard);
		}
	}
	
	@Override
	protected void verify() {
		ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
		allMappings.addAll(resourceMappings);
		allMappings.addAll(hiddenMappings);
		
		IStatus status = J2EEModuleDeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged, currentClasspathEntries);
		setErrorMessage(status);
	}

//	
//	@Override




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation 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:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jst.j2ee.internal.ui;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DeploymentAssemblyVerifierData;
import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
import org.eclipse.wst.server.core.IRuntime;

public class J2EEModuleDeploymentAssemblyVerifierData extends DeploymentAssemblyVerifierData{
	
	public J2EEModuleDeploymentAssemblyVerifierData(IVirtualComponent component, IRuntime runtime, ArrayList<IVirtualReference> currentReferences,
			ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged, List<ClasspathEntryProxy> currentClasspathEntries2) {
		super(component, runtime, currentReferences,resourceMappings, resourceMappingsChanged);
		this.currentClasspathEntries = currentClasspathEntries2;
	}
	private List<ClasspathEntryProxy> currentClasspathEntries;

	public List<ClasspathEntryProxy> getCurrentClasspathEntries() {
		return currentClasspathEntries;
	}
	public void setCurrentClasspathEntries(List<ClasspathEntryProxy> currentClasspathEntries) {
		this.currentClasspathEntries = currentClasspathEntries;
	}
}




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation 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:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jst.j2ee.internal.ui;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.componentcore.ui.Messages;
import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DeploymentAssemblyVerifierHelper;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.IDeploymentAssemblyVerifier;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.VerifierRegistryReader;
import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
import org.eclipse.wst.server.core.IRuntime;

public class J2EEModuleDeploymentAssemblyVerifierHelper {
	
	
	/**
	 * This method will use the facet framework to find all registered verifiers based on installed facets and runtimes.
	 * All the verifiers will have an opportunity to verify and return status on the proposed component mappings
	 * @param component
	 * @param runtime
	 * @param resourceMappingsChanged 
	 * @param resourceMappings 
	 * @param currentReferences 
	 * @param currentClasspathEntries
	 * @return IStatus
	 */
	public static IStatus verify(IVirtualComponent component,IRuntime runtime, ArrayList<IVirtualReference> currentReferences, ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged, List<ClasspathEntryProxy> currentClasspathEntries) {
		IProject project = component.getProject();
		
		List verifiers = DeploymentAssemblyVerifierHelper.collectAllVerifiers(project,runtime);
		if (verifiers.isEmpty()) return Status.OK_STATUS;
		MultiStatus masterStatus = new MultiStatus(ModuleCoreUIPlugin.PLUGIN_ID, IStatus.OK, Messages.DeploymentAssemblyVerifierHelper_0,null); 
		
		for (int i = 0; i < verifiers.size(); i++) {
			if (!(verifiers.get(i) instanceof IConfigurationElement))
				continue;
			IDeploymentAssemblyVerifier verifier = null;
			try {
				verifier = (IDeploymentAssemblyVerifier) ((IConfigurationElement) verifiers.get(i)).createExecutableExtension(VerifierRegistryReader.VERIFIER_CLASS);
				J2EEModuleDeploymentAssemblyVerifierData data = new J2EEModuleDeploymentAssemblyVerifierData(component, runtime,currentReferences,resourceMappings,resourceMappingsChanged,currentClasspathEntries );
				IStatus verifyStatus = verifier.verify(data);
				masterStatus.add(verifyStatus);
			} catch (Exception e) {
				ModuleCoreUIPlugin.log(e);
				continue;
			}
			
		}
		return masterStatus;
	}	
}

Lines 75-81 Link Here

(-)src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java (-1 / +1 lines)
75	* @param runtime	75	* @param runtime
76	* @return all verifiers by iterating through projects installed facets, and querying the registry	76	* @return all verifiers by iterating through projects installed facets, and querying the registry
77	*/	77	*/
78	private static List collectAllVerifiers(IProject project, IRuntime runtime) {	78	public static List collectAllVerifiers(IProject project, IRuntime runtime) {
79	IFacetedProject fProj = null;	79	IFacetedProject fProj = null;
80	try {	80	try {
81	fProj = ProjectFacetsManager.create(project);	81	fProj = ProjectFacetsManager.create(project);




		allMappings.addAll(hiddenMappings);
		
		IStatus status = DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);
		setErrorMessage(status);
	}
	
	protected void setErrorMessage(IStatus status) {
		// Clear the messages
		propPage.setErrorMessage(null);
		propPage.setMessage(null);
		if(status != null) {
			if (status.isMultiStatus()) {
				MultiStatus multi = (MultiStatus)status;
				if (!multi.isOK()) {
					propPage.setMessage(getMessage(multi), multi.getSeverity());
					if (multi.getSeverity() == IStatus.ERROR) {
						propPage.setErrorMessage(getMessage(multi));
						propPage.setValid(false);
					}
					else 
						propPage.setValid(true);
				} else propPage.setValid(true);
			} else if (status.isOK()) propPage.setValid(true);
			propPage.getContainer().updateMessage();
		}
	}

	private String getMessage(MultiStatus multi) {

Return to bug 325911

Lines 21-26 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java (+11 lines)
21	import org.eclipse.core.runtime.CoreException;	21	import org.eclipse.core.runtime.CoreException;
22	import org.eclipse.core.runtime.IPath;	22	import org.eclipse.core.runtime.IPath;
23	import org.eclipse.core.runtime.IProgressMonitor;	23	import org.eclipse.core.runtime.IProgressMonitor;
		24	import org.eclipse.core.runtime.IStatus;
24	import org.eclipse.core.runtime.Path;	25	import org.eclipse.core.runtime.Path;
25	import org.eclipse.jdt.core.IClasspathAttribute;	26	import org.eclipse.jdt.core.IClasspathAttribute;
26	import org.eclipse.jdt.core.IClasspathEntry;	27	import org.eclipse.jdt.core.IClasspathEntry;
Lines 296-301 Link Here
296	super.handleAddDirective(wizard);	297	super.handleAddDirective(wizard);
297	}	298	}
298	}	299	}
		300
		301	@Override
		302	protected void verify() {
		303	ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
		304	allMappings.addAll(resourceMappings);
		305	allMappings.addAll(hiddenMappings);
		306
		307	IStatus status = J2EEModuleDeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged, currentClasspathEntries);
		308	setErrorMessage(status);
		309	}
299		310
300	//	311	//
301	// @Override	312	// @Override

Lines 703-724 Link Here

(-)src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java (-13 / +19 lines)
703	allMappings.addAll(hiddenMappings);	703	allMappings.addAll(hiddenMappings);
704		704
705	IStatus status = DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);	705	IStatus status = DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);
		706	setErrorMessage(status);
		707	}
		708
		709	protected void setErrorMessage(IStatus status) {
706	// Clear the messages	710	// Clear the messages
707	propPage.setErrorMessage(null);	711	propPage.setErrorMessage(null);
708	propPage.setMessage(null);	712	propPage.setMessage(null);
709	if (status.isMultiStatus()) {	713	if(status != null) {
710	MultiStatus multi = (MultiStatus)status;	714	if (status.isMultiStatus()) {
711	if (!multi.isOK()) {	715	MultiStatus multi = (MultiStatus)status;
712	propPage.setMessage(getMessage(multi), multi.getSeverity());	716	if (!multi.isOK()) {
713	if (multi.getSeverity() == IStatus.ERROR) {	717	propPage.setMessage(getMessage(multi), multi.getSeverity());
714	propPage.setErrorMessage(getMessage(multi));	718	if (multi.getSeverity() == IStatus.ERROR) {
715	propPage.setValid(false);	719	propPage.setErrorMessage(getMessage(multi));
716	}	720	propPage.setValid(false);
717	else	721	}
718	propPage.setValid(true);	722	else
719	} else propPage.setValid(true);	723	propPage.setValid(true);
720	} else if (status.isOK()) propPage.setValid(true);	724	} else propPage.setValid(true);
721	propPage.getContainer().updateMessage();	725	} else if (status.isOK()) propPage.setValid(true);
		726	propPage.getContainer().updateMessage();
		727	}
722	}	728	}
723		729
724	private String getMessage(MultiStatus multi) {	730	private String getMessage(MultiStatus multi) {

Added Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierData.java (+38 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jst.j2ee.internal.ui;
12
13	import java.util.ArrayList;
14	import java.util.List;
15
16	import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
17	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
18	import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
19	import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DeploymentAssemblyVerifierData;
20	import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
21	import org.eclipse.wst.server.core.IRuntime;
22
23	public class J2EEModuleDeploymentAssemblyVerifierData extends DeploymentAssemblyVerifierData{
24
25	public J2EEModuleDeploymentAssemblyVerifierData(IVirtualComponent component, IRuntime runtime, ArrayList<IVirtualReference> currentReferences,
26	ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged, List<ClasspathEntryProxy> currentClasspathEntries2) {
27	super(component, runtime, currentReferences,resourceMappings, resourceMappingsChanged);
28	this.currentClasspathEntries = currentClasspathEntries2;
29	}
30	private List<ClasspathEntryProxy> currentClasspathEntries;
31
32	public List<ClasspathEntryProxy> getCurrentClasspathEntries() {
33	return currentClasspathEntries;
34	}
35	public void setCurrentClasspathEntries(List<ClasspathEntryProxy> currentClasspathEntries) {
36	this.currentClasspathEntries = currentClasspathEntries;
37	}
38	}