Attachment #68705 for bug #179329

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

Lines 12-18 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/provisional/util/ProjectHelper.java (-8 / +15 lines)
12		12
13	package org.eclipse.tptp.wsdm.tooling.provisional.util;	13	package org.eclipse.tptp.wsdm.tooling.provisional.util;
14		14
		15	import java.io.File;
15	import java.net.URI;	16	import java.net.URI;
		17	import java.net.URL;
16		18
17	import org.eclipse.core.filesystem.URIUtil;	19	import org.eclipse.core.filesystem.URIUtil;
18	import org.eclipse.core.resources.ICommand;	20	import org.eclipse.core.resources.ICommand;
Lines 25-32 Link Here
25	import org.eclipse.core.runtime.CoreException;	27	import org.eclipse.core.runtime.CoreException;
26		28
27	public abstract class ProjectHelper {	29	public abstract class ProjectHelper {
28		30
29	protected IProject getProject(String location, String name) throws CoreException {	31	protected IProject getProject(String location, String name, String natureId, boolean create) throws CoreException {
30	IWorkspace workspace = ResourcesPlugin.getWorkspace();	32	IWorkspace workspace = ResourcesPlugin.getWorkspace();
31	IWorkspaceRoot root = workspace.getRoot();	33	IWorkspaceRoot root = workspace.getRoot();
32		34
Lines 35-43 Link Here
35	URI projectURI = location==null?null:URIUtil.toURI(location);	37	URI projectURI = location==null?null:URIUtil.toURI(location);
36	desc.setLocationURI(projectURI);	38	desc.setLocationURI(projectURI);
37		39
		40	if(natureId != null) {
		41	addNature(natureId, desc);
		42	}
		43
38	IProject project = root.getProject(name);	44	IProject project = root.getProject(name);
39		45
40	if(project != null) {	46	if(create && project != null) {
41	project.create(desc, null);	47	project.create(desc, null);
42	project.open(null);	48	project.open(null);
43	}	49	}
Lines 45-59 Link Here
45	return project;	51	return project;
46	}	52	}
47		53
48	public void addNature(String natureId) throws CoreException {	54	private void addNature(String natureId, IProjectDescription description) throws CoreException {
49	IProject project = getProject();
50	IProjectDescription description = project.getDescription();
51	String[] natures = description.getNatureIds();	55	String[] natures = description.getNatureIds();
52	String[] newNatures = new String[natures.length + 1];	56	String[] newNatures = new String[natures.length + 1];
53	System.arraycopy(natures, 0, newNatures, 0, natures.length);	57	System.arraycopy(natures, 0, newNatures, 0, natures.length);
54	newNatures[natures.length] = natureId;	58	newNatures[natures.length] = natureId;
55	description.setNatureIds(newNatures);	59	description.setNatureIds(newNatures);
56	project.setDescription(description, null);
57	}	60	}
58		61
59	public void refreshProject() throws Exception {	62	public void refreshProject() throws Exception {
Lines 72-76 Link Here
72	getProject().setDescription(desc, null);	75	getProject().setDescription(desc, null);
73	}	76	}
74		77
		78	public static File toFile(URL url) {
		79	return new File(url.getFile());
		80	}
		81
75	public abstract IProject getProject();	82	public abstract IProject getProject();
76	}	83	}

Lines 21-28 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/internal/util/PluginProjectHelper.java (-2 / +2 lines)
21	private static final String PLUGIN_NATURE = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$	21	private static final String PLUGIN_NATURE = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
22		22
23	public PluginProjectHelper(String projectLocation, String projectName) throws Exception {	23	public PluginProjectHelper(String projectLocation, String projectName) throws Exception {
24	super(projectLocation, projectName);	24	super(projectLocation, projectName, JavaCore.NATURE_ID);
25	addNature(PLUGIN_NATURE);	25	initializeClasspath();
26	IClasspathEntry cpe = JavaCore.newContainerEntry(Path.fromOSString("org.eclipse.pde.core.requiredPlugins")); //$NON-NLS-1$	26	IClasspathEntry cpe = JavaCore.newContainerEntry(Path.fromOSString("org.eclipse.pde.core.requiredPlugins")); //$NON-NLS-1$
27	addClasspathEntry(cpe);	27	addClasspathEntry(cpe);
28	}	28	}

Lines 31-43 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/internal/util/JavaProjectHelper.java (-4 / +10 lines)
31		31
32	IProject _project = null;	32	IProject _project = null;
33		33
34	public JavaProjectHelper(String location, String projectName) throws Exception {	34	public JavaProjectHelper(String location, String projectName, String natureId) throws Exception {
35	_project = getProject(location, projectName);	35	if(natureId == null) {
36	addNature(JavaCore.NATURE_ID);	36	natureId = JavaCore.NATURE_ID;
		37	}
		38	_project = getProject(location, projectName, natureId, true);
37	initializeClasspath();	39	initializeClasspath();
38	}	40	}
		41
		42	public JavaProjectHelper(String location, String projectName) throws Exception {
		43	this(location, projectName, JavaCore.NATURE_ID);
		44	}
39		45
40	private void initializeClasspath() throws JavaModelException {	46	protected void initializeClasspath() throws JavaModelException {
41	IJavaProject javaProj = JavaCore.create(_project);	47	IJavaProject javaProj = JavaCore.create(_project);
42	javaProj.setRawClasspath(new IClasspathEntry[] {}, null);	48	javaProj.setRawClasspath(new IClasspathEntry[] {}, null);
43	addClasspathEntry(JavaRuntime.getDefaultJREContainerEntry());	49	addClasspathEntry(JavaRuntime.getDefaultJREContainerEntry());




/*******************************************************************************
 * Copyright (c) 2007 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
 * $Id: EclipseOsgiMiniProjectizer.java,v 1.2 2007/05/07 09:15:19 dnsmith Exp $
 * 
 * Contributors:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.tptp.wsdm.tooling.internal.projectizer;

import org.apache.muse.tools.generator.projectizer.OsgiMiniProjectizer;

public class EclipseOsgiMiniProjectizer extends OsgiMiniProjectizer {

}




	private File[] _additionalJars;
	private Object[][] _instances;

	private int _resourceCounter = 0;

	private String _projectLocation;

	private String _projectName;

		
		loadParameters(data);		
		
		PluginProjectHelper helper = createProject(_projectLocation, _projectName);		
		
		_targetDirectory = helper.getProjectDirectory();
		
		File descriptorFile = new File(_targetDirectory, EclipseOsgiProjectizerConstants.MUSE_DESCRIPTOR_FILE);
				
		File javaSourceDir = new File(_targetDirectory, OsgiProjectizerConstants.JAVA_SRC_DIR);
				
		createJavaSources(javaSourceDir, _filesMaps);
		createArtifacts(javaSourceDir);						
						
		helper.refreshProject();
	}
	
	protected void createArtifacts(File javaSourceDir) throws Exception {
		createActivatorFile(javaSourceDir, EclipseOsgiProjectizerConstants.ACTIVATOR_FILE_RESOURCE);
		
		File routerEntriesDir = new File(_targetDirectory,OsgiProjectizerConstants.ROUTER_ENTRIES_DIR);
		
		File descriptorFile = new File(_targetDirectory, EclipseOsgiProjectizerConstants.MUSE_DESCRIPTOR_FILE);
		
		File wsdldir = new File(_targetDirectory, OsgiProjectizerConstants.WSDL_DIR);
		
		createManifest(_targetDirectory, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE);				
		
		for(int i=0; i < _capabilitiesList.length; i++) {

		}
		
		createBuildProperties(_targetDirectory, EclipseOsgiProjectizerConstants.BUILD_PROPERTIES_FILE_RESOURCE, EclipseOsgiProjectizerConstants.BUILD_PROPERTIES_FILE);
	}
	
	protected void loadParameters(ConfigurationData data) {
		super.loadParameters(data);
		_additionalJars = (File[])data.getParameter(EclipseConfigurationData.ADDITIONAL_JARS);
		_instances = (Object[][])data.getParameter(EclipseConfigurationData.INSTANCES);
		_projectName = (String)data.getParameter(EclipseConfigurationData.PROJECT_NAME);
		_projectLocation = (String)data.getParameter(EclipseConfigurationData.PROJECT_LOCATION);
	}
		
	protected void createRouterEntries(File routerEntriesDir, Object[][] instances)
			throws Exception {
			
		for(int i=0; i < instances.length; i++) {
			Object[] instancePair = instances[i];
		for(int i=0; i < _instances.length; i++) {
			Object[] instancePair = _instances[i];
			
			//
			//This is really tacky, but it's the only real way to do this

			Element instanceElement = (Element) instancePair[1];
			
			File serviceDir = new File(routerEntriesDir, resourcePathName);				
			File routerEntryFile = new File(serviceDir, getResourceFileName(i));
			
			writeToFileCheck(instanceElement, routerEntryFile);				
		}
	}
	
	/**
	 * Get the name of a resource-instance file with the appropriate counter. This is 
	 * really just a string-replace of the PLACE_HOLDER value with the given counter
	 * 
	 * @param counter	The number to use in the string replace
	 * @return 			The string with PLACE_HOLDER replaced by the string value of counter
	 */
	protected String getResourceFileName(int counter) {
		return Axis2ProjectizerConstants.RESOURCE_FILE.replaceFirst(PLACE_HOLDER, String.valueOf(counter));
		_projectLocation = (String)data.getParameter(EclipseConfigurationData.PROJECT_LOCATION);
	}

	protected void createManifest(File baseTargetDir, String manifestFileResource, String manifestFileName) throws Exception {

		
		String packageName = getSymbolicName().toString();
		
		Object[] filler = { getSymbolicName(), makeActivatorName(packageName), getSymbolicName()};
		String newManifest = loadString(manifestTemplateIS, filler);
		
		newManifest = addAdditionalJars(newManifest);

		writeToFileCheck(newManifest, manifestFile);
	}
	
	protected String makeActivatorName(String packageName) {
		return packageName + "." + EclipseOsgiProjectizerConstants.ACTIVATOR_CLASSNAME;
	}

	private String addAdditionalJars(String newManifest) throws IOException {
		ByteArrayInputStream bais = new ByteArrayInputStream(newManifest.getBytes());
		Manifest manifest = null;			




            servicePath="/"
            servicePort="80"/>
   </extension>
   <extension
         point="org.eclipse.tptp.wsdm.editor.codeGeneration">
      <description
            container="Mini"
            platform="OSGi">
      </description>
      <projectizer
            class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseOsgiProjectizer"
            name="OSGi mini"
            servicePath="/"
            servicePort="80">
      </projectizer>
   </extension>
</plugin>




package org.eclipse.tptp.wsdm.tooling.provisional.util;

import org.eclipse.core.runtime.IProgressMonitor;

public class ProgressMonitorHelper {
	
	private IProgressMonitor _monitor;

	public ProgressMonitorHelper(IProgressMonitor monitor) {
		_monitor = monitor;
	}
	
	public void finishProgressMonitor() {
		if (_monitor != null) {
			_monitor.done();
		}
	}

	public void recordProgress(int i) {
		if (_monitor != null) {
			_monitor.worked(1);
		}
	}

	public void startProgressMonitor(int i) {
		if(_monitor != null) {
			_monitor.beginTask("Running Projectizer", i);
		}
	}

	public void recordProgress() {
		recordProgress(1);
	}
}




import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.Util;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.TextProcessor;

import org.eclipse.tptp.wsdm.tooling.editor.internal.Activator;
import org.eclipse.tptp.wsdm.tooling.editor.mrt.relationship.dialog.internal.MemoryComboBox;
import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;
import org.eclipse.tptp.wsdm.tooling.preferences.internal.Axis2ServerLocationPreferencePage;
import org.eclipse.tptp.wsdm.tooling.util.internal.Validation;
import org.eclipse.tptp.wsdm.tooling.validation.util.internal.ValidationUtils;

/**
 * This wizard enables the use to specify the projectizer options and also the


	private Label _containerLabel;

	private Listener _containerComboListener = new Listener() {

		public void handleEvent(Event event) {
			dialogChanged();
		}
		
	};

	public GenerationOptionsPage() {
		super("wizardPage");
		setTitle(Messages.HOOKUP_WIZARD_TXT1);
		setDescription(Messages.HOOKUP_WIZARD_TXT2);
		
		loadExtensionData();
		setPageComplete(false);
	}
	
	private void loadExtensionData() {


		for (int i = 0; i < extensions.length; i++) {	
			IConfigurationElement[] elements = extensions[i].getConfigurationElements();			
			CodeGenerationData codeGenData = new CodeGenerationData(elements);
			updatePlatformContainerMap(codeGenData);	
		}
	}


	public void createControl(Composite parent) {
		setControl(doLayout(parent));
		dialogChanged();
	}

	private Composite doLayout(Composite parent) {

		Combo combo = new Combo(page, SWT.BORDER | SWT.READ_ONLY);
		combo.setEnabled(false);	
		
		combo.addListener(SWT.Modify, _containerComboListener);
		return combo;
	}


	{
		public void handleEvent(Event e)
		{
			setLocationForSelection();
			dialogChanged();
		}
	};

			String platform = _projectizerCombo.getText();
			
			Map containerCodeGenDataMap = (Map) _platformContainerMap.get(platform);
			_containerCombo.removeListener(SWT.Modify, _containerComboListener);
			_containerCombo.removeAll();
			
			boolean hasContainers = containerCodeGenDataMap.size() != 0;

				_containerCombo.select(0);
			}
			
			_containerCombo.addListener(SWT.Modify, _containerComboListener);
			_containerCombo.setEnabled(hasContainers);
			_containerLabel.setEnabled(hasContainers);

		   	dialogChanged();
		}
	};
	
	void setLocationForSelection()
	{
//		 _locationArea.updateProjectName(getProjectNameFieldValue());
	}

	private TargetedFileList[] _filesToCopy;
	
	protected void dialogChanged()
	{
		if(true) return;
		String prjName = getProjectName();

		if (prjName.length() == 0)

			return;
		}
		
		canFlipToNextPage();
		
		updateStatus(null, DialogPage.NONE);
	}



	public boolean shouldPersistArtifacts()
	{
		return _persistExtraArtifactsButton.getSelection();
	}

	/**

		
		return baseAddress;
	}
	
	/**
	 * Checks to see if the Next Page can be enabled or not.
	 */
	public boolean canFlipToNextPage(){
		return true;
//		Axis2ServerLocationPage nextPage = (Axis2ServerLocationPage)this.getNextPage();
//		if(isPageComplete() && isAxis2Project())
//		{			
//			nextPage.makePageComplete(false);
//			String userLocation = nextPage.getUserDefinedLocation();
//			if(userLocation != null && userLocation.trim().length() > 0)
//			{
//				nextPage._serverNameField.setText(userLocation);
//			}else
//			{
//				nextPage._serverNameField.setText(nextPage.getPreferenceServerLocation());
//			}
//
//			return true;
//		}
//		
//		nextPage.makePageComplete(true);
//		
//		return false;
	}

	public boolean canFlipToNextPage() {
		return isPageComplete() && isAxis2Project();
	}
	 */
	public boolean isAxis2Project(){
		String container = getSelectedData().getContainer();
		return container != null && container.equals("Axis2");

	public void saveCombo() {
		MemoryComboBox.save(_projectNameField, PROJECT_MEMORY_COMBO_ID, Preferences.userNodeForPackage(GenerationOptionsPage.class));
	}
	
	private String validateLocation()
	{
		String serverHome = getPreferenceServerLocation();
		
		ISoapServerDependency axisValidators[] = ValidationUtils.getAllAxisValidators();
		for(int i = 0 ; i < axisValidators.length ; i++){
			
			ISoapServerDependency axis2Dependency = (Axis2ServerDependency)axisValidators[i];
			String errorMessage = axis2Dependency.validateSoapServerHome(serverHome);
			if(errorMessage!=null)
				return errorMessage;
			_filesToCopy = axis2Dependency.getFilesToCopy();
			if(_filesToCopy == null)
				_filesToCopy = new TargetedFileList[0];
		}
		return null;		
	}
	
	/**
	 * Returns the Axis2 files to copied to generated code
	 * @return
	 */
	public TargetedFileList[] getAxis2FilesToCopy()
	{
		validateLocation();
		return _filesToCopy;
	}
	
	protected String getPreferenceServerLocation() 
	{
		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
		String location = store.getString(Axis2ServerLocationPreferencePage.SERVER_LOCATION_PREFERENCE_KEY).trim();
		if(location != null && !location.equals(""))
			return location;
		return "";
	}
}





	private GenerationOptionsPage _generationOptionsPage;

	private Axis2ServerLocationPage _axis2ServerLocationPage;

	private String _projectName;

	private boolean _overwrite;

		_generationOptionsPage = new GenerationOptionsPage();
		addPage(_generationOptionsPage);

		_axis2ServerLocationPage = new Axis2ServerLocationPage();
		addPage(_axis2ServerLocationPage);

		// TODO AME why is this hardcoded here? why is it getting reloaded?
		Image imgTP = EclipseUtils.loadImage(PlatformUI.getWorkbench().getDisplay(),
				"icons/wizban/newEndpointProject_wiz.gif");

								_serverLocation);
						// Update the Lib and module location
					}
					_requiredAxis2Files = _generationOptionsPage.getAxis2FilesToCopy();
				} catch (Exception e) {
					throw new RuntimeException(e);
				}

		_projectLocation = _generationOptionsPage.getProjectLocation();

		if (_isAxis2Project) {
			_serverLocation = _generationOptionsPage.getPreferenceServerLocation();
			updatePreference = _axis2ServerLocationPage.isUpdatePreference();
			popupAxis2LicenseDialog();
		}

		IRunnableWithProgress runnable = new IRunnableWithProgress() {
			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
				performFinish(monitor);
					performFinish(monitor);
			}
		};
		


	private void handle(String message, Exception e) {
		_generationOptionsPage.setErrorMessage(message);
		_axis2ServerLocationPage.setErrorMessage(message);

		WsdmToolingLog.log(IStatus.ERROR, IStatus.OK, message, e);
	}
	
	private void openTasksView() {
		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
		ViewPart view = (ViewPart) page.findView(TASK_VIEW_ID);

			page.activate(view);
		}
	}
	
	public boolean canFinish() {
		return _generationOptionsPage.isPageComplete();
	}
}




/*******************************************************************************
 * Copyright (c) 2007 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:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.tptp.wsdm.tooling.codegen.mrt.provisional;

import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.TextProcessor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
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.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.tptp.wsdm.tooling.editor.internal.Activator;
import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;
import org.eclipse.tptp.wsdm.tooling.preferences.internal.Axis2ServerLocationPreferencePage;
import org.eclipse.tptp.wsdm.tooling.validation.util.internal.ValidationUtils;

/**
 * This is Wizard Page to show the Axis2 server location details
 *
 */
public class Axis2ServerLocationPage extends WizardPage
{
	
	protected Text _serverNameField;
	private Button _browseButton;
	private Button _preferenceUpdate;
	private TargetedFileList[] _filesToCopy;
	
	private String userDefinedLocation ="";
	
	/**
	 * Instantiates the class.
	 */
	public Axis2ServerLocationPage() 
	{
		super("wizardPage");
		setTitle(Messages.HOOKUP_WIZARD_TXT1);
		setDescription(Messages.HOOKUP_WIZARD_TXT2);
	}

	/**
	 *  Creates wizard controls.
	 */
	public void createControl(Composite parent) 
	{
		Composite page = new Composite(parent, SWT.NULL);
		GridLayout layout = new GridLayout(1, false);
		page.setLayout(layout);
		createPageControls(page);
		//dialogChanged();
		setControl(page);
	}

	private void createPageControls(Composite page) 
	{
		Composite column = new Composite(page, SWT.NULL);
		GridLayout layout = new GridLayout(2, false);
		column.setLayout(layout);
		createServerLocationColumn(column);
	}

	private void createServerLocationColumn(Composite parent) 
	{
		GridData data = new GridData(GridData.FILL_HORIZONTAL);
		data.horizontalSpan = 2;
        // new server location label
        Label serverLabel = new Label(parent, SWT.NONE);
        serverLabel.setText(Messages.CODE_GEN_AXIS2_LOCATION);
        serverLabel.setFont(parent.getFont());
        serverLabel.setLayoutData(data);

		// server location entry field
        data = new GridData(GridData.FILL_HORIZONTAL);
        data.widthHint = 350;
        data.horizontalSpan = 1;
        _serverNameField = new Text(parent, SWT.BORDER);
        _serverNameField.setLayoutData(data);
        _serverNameField.setFont(parent.getFont());
        _serverNameField.addModifyListener(new ModifyListener()
		{
			public void modifyText(ModifyEvent e)
			{
				boolean pageCompleted = true;
				userDefinedLocation = _serverNameField.getText();
				String errorMsg = validateLocation(); 
				if(errorMsg == null)
				{
					setErrorMessage(errorMsg);
					pageCompleted = true;
				}
				else
				{
					setErrorMessage(errorMsg);
					pageCompleted = false;
				}
				makePageComplete(pageCompleted);
			}
		});
        
    //    _serverNameField.setText(getPreferenceServerLocation());

        // browse button
		_browseButton = new Button(parent, SWT.PUSH);
		_browseButton.setText(Messages.HOOKUP_WIZARD_TXT5);
		_browseButton.addSelectionListener(new SelectionAdapter() 
		{
			public void widgetSelected(SelectionEvent event) 
			{
				handleLocationBrowseButtonPressed();
			}
		});
		
		// server location entry field
        data = new GridData(GridData.FILL_HORIZONTAL);
        //data.widthHint = 350;
        data.horizontalSpan = 2;
        _preferenceUpdate = new Button(parent, SWT.CHECK);
        _preferenceUpdate.setText(Messages.CODE_GEN_UPDATE_PREF);
        _preferenceUpdate.setLayoutData(data);
        _preferenceUpdate.setFont(parent.getFont());		
	}
	
	protected String getPreferenceServerLocation() 
	{
		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
		String location = store.getString(Axis2ServerLocationPreferencePage.SERVER_LOCATION_PREFERENCE_KEY).trim();
		if(location != null && !location.equals(""))
			return location;
		return "";
	}

	private void handleLocationBrowseButtonPressed() 
	{

		String selectedDirectory = null;

		DirectoryDialog dialog = new DirectoryDialog(_serverNameField.getShell());
		dialog.setMessage(Messages.CODE_GEN_DIR_LOCATION);
		//dialog.setFilterPath(dirName);
		selectedDirectory = dialog.open();
		
		if (selectedDirectory != null)
			updateLocationField(selectedDirectory);

	}
	
	private void updateLocationField(String selectedPath) 
	{
		_serverNameField.setText(TextProcessor.process(selectedPath));
	}

	/**
	 * Returns the server location.
	 * @return
	 */
	public String getServerLocation() 
	{
		return _serverNameField.getText();
	}

	/**
	 * Checks to see if Update Preferences checkbox is selected
	 * @return
	 */
	public boolean isUpdatePreference()
	{
		return _preferenceUpdate.getSelection();
	}
	
	private String validateLocation()
	{
		String serverHome = _serverNameField.getText();
		
		ISoapServerDependency axisValidators[] = ValidationUtils.getAllAxisValidators();
		for(int i = 0 ; i < axisValidators.length ; i++){
			
			ISoapServerDependency axis2Dependency = (Axis2ServerDependency)axisValidators[i];
			String errorMessage = axis2Dependency.validateSoapServerHome(serverHome);
			if(errorMessage!=null)
				return errorMessage;
			_filesToCopy = axis2Dependency.getFilesToCopy();
			if(_filesToCopy == null)
				_filesToCopy = new TargetedFileList[0];
		}
		return null;		
	}
	
	/**
	 * Returns the Axis2 files to copied to generated code
	 * @return
	 */
	public TargetedFileList[] getAxis2FilesToCopy()
	{
		return _filesToCopy;
	}

	/**
	 * Method to Set the Wizard page to complete state
	 * @param validPage 
	 */
	public synchronized void makePageComplete(boolean completePage)
	{
		if(completePage){
			setPageComplete(true);
		}
		else
			setPageComplete(false);		
	}
	
	protected String getUserDefinedLocation()
	{
		return userDefinedLocation;
	}
}

Lines 32-38 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/messages.properties (-1 / +1 lines)
32	SYSTEM_CAPS_ERROR_2 = IWAT0646E Access Denied	32	SYSTEM_CAPS_ERROR_2 = IWAT0646E Access Denied
33	HOOKUP_WIZARD_TXT1 = Deployment target and generation options	33	HOOKUP_WIZARD_TXT1 = Deployment target and generation options
34	HOOKUP_WIZARD_TXT2 = This wizard creates code for touchpoint	34	HOOKUP_WIZARD_TXT2 = This wizard creates code for touchpoint
35	HOOKUP_WIZARD_TXT3 = Overwrite files if necessary	35	HOOKUP_WIZARD_TXT3 = Overwrite files
36	HOOKUP_WIZARD_PERSIST = Persist generated artifacts	36	HOOKUP_WIZARD_PERSIST = Persist generated artifacts
37	HOOKUP_WIZARD_TXT4 = Output project	37	HOOKUP_WIZARD_TXT4 = Output project
38	HOOKUP_WIZARD_TXT5 = Browse...	38	HOOKUP_WIZARD_TXT5 = Browse...

Lines 1-7 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseJ2EEMiniProjectizer.java (+285 lines)
		1	/*******************************************************************************
		2	* Copyright (c) 2007 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	* Andrew Eberbach (aeberbac@us.ibm.com)
		10	* IBM Corporation - initial API and implementation
		11	*******************************************************************************/
1	package org.eclipse.tptp.wsdm.tooling.internal.projectizer;	12	package org.eclipse.tptp.wsdm.tooling.internal.projectizer;
2		13
		14	import java.io.File;
		15	import java.io.FileNotFoundException;
		16	import java.io.InputStream;
		17	import java.net.URL;
		18	import java.util.Map;
		19
3	import org.apache.muse.tools.generator.projectizer.J2EEMiniProjectizer;	20	import org.apache.muse.tools.generator.projectizer.J2EEMiniProjectizer;
		21	import org.apache.muse.tools.generator.util.ConfigurationData;
		22	import org.apache.muse.util.FileUtils;
		23	import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
		24	import org.apache.muse.ws.wsdl.WsdlUtils;
		25	import org.eclipse.core.runtime.FileLocator;
		26	import org.eclipse.core.runtime.IProgressMonitor;
		27	import org.eclipse.core.runtime.Platform;
		28	import org.eclipse.tptp.wsdm.tooling.codegen.mrt.provisional.EclipseConfigurationData;
		29	import org.eclipse.tptp.wsdm.tooling.internal.util.WebProjectHelper;
		30	import org.eclipse.tptp.wsdm.tooling.provisional.util.ProgressMonitorHelper;
		31	import org.eclipse.tptp.wsdm.tooling.provisional.util.ProjectHelper;
		32	import org.w3c.dom.Document;
		33	import org.w3c.dom.Element;
4		34
5	public class EclipseJ2EEMiniProjectizer extends J2EEMiniProjectizer {	35	public class EclipseJ2EEMiniProjectizer extends J2EEMiniProjectizer {
		36	private static final String[] LIB_BUNDLE_IDS = {
		37	"org.apache.muse.api", //$NON-NLS-1$
		38	"org.apache.muse.impl", //$NON-NLS-1$
		39	"org.apache.muse.core", //$NON-NLS-1$
		40	"org.apache.muse.tools", //$NON-NLS-1$
		41	"org.apache.muse.utils" //$NON-NLS-1$
		42	};
		43
		44	private static final String CONTAINER_BUNDLE = "org.apache.muse.tools";//$NON-NLS-1$
		45	private static final String CONTAINER_RESOURCE = "/containers/muse-platform-mini-2.2.0.jar";//$NON-NLS-1$
		46
		47	private String _projectName;
		48	private String _projectLocation;
		49	private File[] _additionalJars;
		50	private Object[][] _instances;
		51	private ProgressMonitorHelper _progressMonitorHelper;
		52
		53	public void projectize(ConfigurationData configuration) throws Exception {
		54	ConfigurationData.checkConfiguration(this, configuration);
		55	loadParameters(configuration);
		56	ProgressMonitorHelper progressHelper = getProgressMonitor();
		57	progressHelper.startProgressMonitor(6);
		58
		59	try {
		60	WebProjectHelper helper = createProjectHelper();
		61
		62	helper.setSuspendValidation(true);
		63
		64	createJavaSources(helper, progressHelper);
		65	createArtifacts(helper, progressHelper);
		66	createLibraries(helper, progressHelper);
		67
		68	helper.refreshProject();
		69	helper.setSuspendValidation(false);
		70	} finally {
		71	progressHelper.finishProgressMonitor();
		72	}
		73	}
		74
		75	protected void createLibraries(WebProjectHelper helper, ProgressMonitorHelper progressHelper) throws Exception {
		76	copyLibrariesFromBundles(helper, LIB_BUNDLE_IDS);
		77	progressHelper.recordProgress();
		78
		79	copyAdditionalJars(helper);
		80	progressHelper.recordProgress();
		81
		82	copyContainer(helper);
		83	progressHelper.recordProgress();
		84	}
		85
		86	protected void copyContainer(WebProjectHelper helper) throws Exception {
		87	File webInfLibDir = new File(helper.getProjectDirectory(), EclipseJ2EEMiniProjectizerConstants.WEBINFLIB_DIR);
		88	URL url = Platform.getBundle(CONTAINER_BUNDLE).getEntry(CONTAINER_RESOURCE);
		89	url = FileLocator.toFileURL(url);
		90
		91	File libSource = ProjectHelper.toFile(url);
		92	FileUtils.copy(libSource, webInfLibDir);
		93	}
		94
		95	protected void copyAdditionalJars(WebProjectHelper helper) throws Exception {
		96	File webInfLibDir = new File(helper.getProjectDirectory(), EclipseJ2EEMiniProjectizerConstants.WEBINFLIB_DIR);
		97
		98	File[] additionalJars = getAdditionalJars();
		99
100	if(additionalJars != null) {
101	for (int i=0; i < additionalJars.length; i++) {
102	if(!additionalJars[i].exists()) {
103	throw new FileNotFoundException(additionalJars[i].getAbsolutePath());
104	}
105
106	FileUtils.copyFile(additionalJars[i], webInfLibDir);
107	}
108	}
109	}
110
111	protected void copyLibrariesFromBundles(WebProjectHelper helper, String[] libBundleIds) throws Exception {
112	URL url = null;
113	File webInfDir = new File(helper.getProjectDirectory(), EclipseJ2EEMiniProjectizerConstants.WEBINF_DIR);
114
115	for (int i=0; i < libBundleIds.length; i++) {
116	url = Platform.getBundle(libBundleIds[i]).getEntry(EclipseJ2EEMiniProjectizerConstants.PROJECT_LIB_DIR_RESOURCE);
117	url = FileLocator.toFileURL(url);
118
119	File libSource = ProjectHelper.toFile(url);
120	FileUtils.copyDirectory(libSource, webInfDir);
121	}
122	}
123
124	protected WebProjectHelper createProjectHelper() throws Exception {
125	return new WebProjectHelper(
126	getProjectName(),
127	getProjectLocation(),
128	EclipseJ2EEMiniProjectizerConstants.JAVA_BIN_DIR,
129	EclipseJ2EEMiniProjectizerConstants.JAVA_SRC_DIR);
130	}
131
132	protected void createJavaSources(WebProjectHelper helper, ProgressMonitorHelper progressHelper) throws Exception {
133	File javaSourceDir = new File(
134	helper.getProjectDirectory(),
135	EclipseJ2EEMiniProjectizerConstants.JAVA_SRC_DIR);
136
137	createJavaSources(javaSourceDir, getFilesMaps());
138	progressHelper.recordProgress();
139	}
140
141	protected void createArtifacts(WebProjectHelper helper, ProgressMonitorHelper progressHelper) throws Exception {
142	File descriptorFile = new File(
143	helper.getProjectDirectory(),
144	EclipseJ2EEMiniProjectizerConstants.DESCRIPTOR_FILE);
145
146	File wsdldir = new File(
147	helper.getProjectDirectory(),
148	EclipseJ2EEMiniProjectizerConstants.WSDL_DIR);
149
150	File routerEntriesDir = new File(
151	helper.getProjectDirectory(),
152	EclipseJ2EEMiniProjectizerConstants.ROUTER_ENTRIES_DIR);
153
154	for(int i=0; i < getNumCapabilityMaps(); i++) {
155	Map capabilities = getCapabilityMap(i);
156	MetadataDescriptor rmd = getMetadata(i);
157	Document wsdl = getWsdl(i);
158
159	createDescriptor(getDescriptor(),
160	wsdl,
161	descriptorFile,
162	capabilities,
163	EclipseJ2EEMiniProjectizerConstants.WSDL_RELATIVE_PATH,
164	i);
165
166	createRMDFile(rmd, wsdl, wsdldir);
167	createWSDLFile(wsdl, wsdldir);
168
169	if(getInstances() == null) {
170	createRouterEntries(routerEntriesDir, WsdlUtils.getServiceName(wsdl.getDocumentElement()), _capabilitiesList[i]);
171	}
172	}
173
174	progressHelper.recordProgress();
175
176	if(getInstances() != null) {
177	createRouterEntries(routerEntriesDir, getInstances());
178	}
179
180	createWebDescriptor(helper);
181	createBuildFile(helper.getProjectDirectory(),
182	EclipseJ2EEMiniProjectizerConstants.BUILD_FILE_RESOURCE,
183	EclipseJ2EEMiniProjectizerConstants.BUILD_FILE);
184
185	progressHelper.recordProgress();
186	}
187
188	protected void createBuildFile(File baseTargetDir, String buildFileResource, String buildFile) throws Exception {
189	InputStream buildTemplate = FileUtils.loadFromContext(this.getClass(),buildFileResource);
190	File build = new File(baseTargetDir, buildFile);
191	copyStreamCheck(buildTemplate, build);
192	}
193
194	protected void createWebDescriptor(WebProjectHelper helper) throws Exception {
195	File webInfDir = new File(helper.getProjectDirectory(),EclipseJ2EEMiniProjectizerConstants.WEBINF_DIR);
196	File descriptorFile = new File(webInfDir, EclipseJ2EEMiniProjectizerConstants.WEBXML_FILE);
197	if(!descriptorFile.delete()) {
198	throw new Exception();
199	}
200	createFileFromResource(webInfDir,
201	EclipseJ2EEMiniProjectizerConstants.WEBXML_RESOURCE,
202	EclipseJ2EEMiniProjectizerConstants.WEBXML_FILE);
203	}
204
205	protected Map getCapabilityMap(int index) {
206	return _capabilitiesList[index];
207	}
208
209	protected void createRouterEntries(File routerEntriesDir,Object[][] instances) throws Exception {
210	routerEntriesDir.mkdirs();
211
212	for (int i = 0; i < getInstances().length; i++) {
213	Object[] instancePair = getInstances()[i];
214
215	//
216	// This is really tacky, but it's the only real way to do this
217	// since there are no pairs. The File use is to get the last element
218	// of the path in a nice, non-hack way.
219	//
220	String path = (String) instancePair[0];
221	String resourcePathName = new File(path).getName();
222
223	Element instanceElement = (Element) instancePair[1];
224
225	File serviceDir = new File(routerEntriesDir, resourcePathName);
226	File routerEntryFile = new File(serviceDir, getResourceFileName(i));
227
228	writeToFileCheck(instanceElement, routerEntryFile);
229	}
230	}
231
232	/**
233	* Get the name of a resource-instance file with the appropriate counter. This is
234	* really just a string-replace of the PLACE_HOLDER value with the given counter
235	*
236	* @param counter The number to use in the string replace
237	* @return The string with PLACE_HOLDER replaced by the string value of counter
238	*/
239	protected String getResourceFileName(int counter) {
240	return EclipseJ2EEMiniProjectizerConstants.RESOURCE_FILE.replaceFirst(PLACE_HOLDER, String.valueOf(counter));
241	}
242
243	protected void loadParameters(ConfigurationData data) {
244	super.loadParameters(data);
245
246	_additionalJars = (File[]) data.getParameter(EclipseConfigurationData.ADDITIONAL_JARS);
247	_instances = (Object[][]) data.getParameter(EclipseConfigurationData.INSTANCES);
248	_progressMonitorHelper = new ProgressMonitorHelper((IProgressMonitor) data.getParameter(EclipseConfigurationData.PROGRESS_MONITOR));
249	_projectName = (String) data.getParameter(EclipseConfigurationData.PROJECT_NAME);
250	_projectLocation = (String) data.getParameter(EclipseConfigurationData.PROJECT_LOCATION);
251	}
252
253	protected File[] getAdditionalJars() {
254	return _additionalJars;
255	}
256
257	protected Map[] getFilesMaps() {
258	return _filesMaps;
259	}
260
261	protected String getProjectLocation() {
262	return _projectLocation;
263	}
264
265	protected String getProjectName() {
266	return _projectName;
267	}
268
269	protected ProgressMonitorHelper getProgressMonitor() {
270	return _progressMonitorHelper;
271	}
272
273	protected Object[][] getInstances() {
274	return _instances;
275	}
276
277	protected Document getDescriptor() {
278	return _descriptor;
279	}
280
281	protected int getNumCapabilityMaps() {
282	return _capabilitiesList.length;
283	}
284
285	protected Document getWsdl(int index) {
286	return _wsdls[index];
287	}
6		288
		289	protected MetadataDescriptor getMetadata(int index) {
		290	return _metadatas[index];
		291	}
7	}	292	}




/*******************************************************************************
 * Copyright (c) 2007 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:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.tptp.wsdm.tooling.internal.projectizer;


import java.io.File;
import java.io.FileNotFoundException;
import java.net.URL;
import java.util.Map;

import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
import org.apache.muse.tools.generator.projectizer.J2EEAxis2Projectizer;
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ServicesDescriptorHelper;
import org.apache.muse.util.FileUtils;
import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
import org.apache.muse.ws.wsdl.WsdlUtils;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.tptp.wsdm.tooling.codegen.mrt.provisional.EclipseConfigurationData;
import org.eclipse.tptp.wsdm.tooling.codegen.mrt.provisional.TargetedFileList;
import org.eclipse.tptp.wsdm.tooling.internal.codegeneration.Activator;
import org.eclipse.tptp.wsdm.tooling.internal.util.WebProjectHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

/**
 * Construct the projectizer for code generation
 */
public class EclipseAxis2Projectizer extends J2EEAxis2Projectizer {
	
	private static final String[] LIB_BUNDLE_IDS = { 
		"org.apache.muse.api", //$NON-NLS-1$
		"org.apache.muse.impl", //$NON-NLS-1$
		"org.apache.muse.core", //$NON-NLS-1$
		"org.apache.muse.tools", //$NON-NLS-1$
		"org.apache.muse.utils" //$NON-NLS-1$
		};
	
	private static final String[] MODULE_BUNDLE_IDS = { 
		"org.apache.muse.tools", //$NON-NLS-1$
		};
	
	private File[] _additionalJars;
	private Object[][] _instances;
	private IProgressMonitor _progressMonitor;
	private TargetedFileList[] _filesToCopy;

	private int _resourceCounter = 0;

	private String _projectName;

	private String _projectLocation;
	
	public void projectize(ConfigurationData configuration) throws Exception {
		
		ConfigurationData.checkConfiguration(this, configuration);
				
		try {
			
		loadParameters(configuration);

		startProgressMonitor(_progressMonitor, 10);

		WebProjectHelper helper = createProject();
		
		_targetDirectory = helper.getProjectDirectory();		
		
		recordProgress(_progressMonitor, 1);
		
		helper.setSuspendValidation(true);

		File webContentDir = copyTemplate(_targetDirectory);
		recordProgress(_progressMonitor, 1);
						
		File descriptorFile = new File(
				webContentDir, 
				Axis2ProjectizerConstants.DESCRIPTOR_FILE);
		
		File javaSourceDir = new File(
				_targetDirectory, 
				Axis2ProjectizerConstants.JAVA_SRC_DIR);
		
		createJavaSources(javaSourceDir, _filesMaps);
		recordProgress(_progressMonitor, 1);
		
		File wsdldir = new File(
				webContentDir, 
				Axis2ProjectizerConstants.WSDL_DIR);

		File routerEntriesDir = new File(webContentDir,Axis2ProjectizerConstants.ROUTER_ENTRIES_DIR);
		
		ServicesDescriptorHelper servicesHelper = new ServicesDescriptorHelper();
				
		createBuildFile(_targetDirectory, EclipseAxis2ProjectizerConstants.BUILD_FILE_RESOURCE, EclipseAxis2ProjectizerConstants.BUILD_FILE);
		recordProgress(_progressMonitor, 1);
		
		for(int i=0; i < _capabilitiesList.length; i++) {
			Map capabilities = _capabilitiesList[i];
			Document wsdl = _wsdls[i];
			createDescriptor(_descriptor, wsdl, descriptorFile, capabilities, Axis2ProjectizerConstants.WSDL_RELATIVE_PATH, i);						
			MetadataDescriptor rmd = _metadatas[i];
			createRMDFile(rmd, wsdl, wsdldir);
			createWSDLFile(wsdl, wsdldir);
			if(_instances == null) {
				createRouterEntries(routerEntriesDir, WsdlUtils.getServiceName(wsdl.getDocumentElement()), _capabilitiesList[i]);
			}
			updateServicesDescriptor(servicesHelper, wsdl, capabilities);
		}		
					
		if(_instances != null) {
			createRouterEntries(routerEntriesDir, _instances);
		}
		recordProgress(_progressMonitor, 4);
		
		File servicesFile = new File(webContentDir, Axis2ProjectizerConstants.SERVICES_FILE);
		createServicesDescriptor(servicesHelper, servicesFile);
		recordProgress(_progressMonitor, 1);
		
		helper.refreshProject();
		recordProgress(_progressMonitor, 1);
		
		helper.setSuspendValidation(false);
		} finally {
			finishProgressMonitor(_progressMonitor);
		}
	}
		
	private void finishProgressMonitor(IProgressMonitor monitor) {
		if(monitor != null) {
			monitor.done();
		}
	}

	private void recordProgress(IProgressMonitor monitor, int i) {
		if(monitor != null) {
			monitor.worked(1);
		}
	}

	private void startProgressMonitor(IProgressMonitor monitor, int i) {
		if(monitor != null) {
			monitor.beginTask("Running Projectizer", 9);
		}
	}

	protected void loadParameters(ConfigurationData data) {
		super.loadParameters(data);
		
		_additionalJars = (File[])data.getParameter(EclipseConfigurationData.ADDITIONAL_JARS);
		_instances = (Object[][])data.getParameter(EclipseConfigurationData.INSTANCES);	
		_progressMonitor = (IProgressMonitor)data.getParameter(EclipseConfigurationData.PROGRESS_MONITOR);
		_filesToCopy = (TargetedFileList[])data.getParameter(EclipseConfigurationData.AXIS2_FILES);
		_projectName = (String)data.getParameter(EclipseConfigurationData.PROJECT_NAME);
		_projectLocation = (String)data.getParameter(EclipseConfigurationData.PROJECT_LOCATION);		
	}

	private WebProjectHelper createProject() throws Exception {
		WebProjectHelper helper = new WebProjectHelper(_projectName, _projectLocation, EclipseAxis2ProjectizerConstants.JAVA_BIN_DIR, Axis2ProjectizerConstants.JAVA_SRC_DIR);
		
		return helper;
	}
	
	protected void createRouterEntries(File routerEntriesDir,Object[][] instances) throws Exception {
		routerEntriesDir.mkdirs();
		
		for (int i = 0; i < _instances.length; i++) {
			Object[] instancePair = _instances[i];

			//
			// This is really tacky, but it's the only real way to do this
			// since there are no pairs. The File use is to get the last element
			// of the path in a nice, non-hack way.
			//
			String path = (String) instancePair[0];
			String resourcePathName = new File(path).getName();

			Element instanceElement = (Element) instancePair[1];

			File serviceDir = new File(routerEntriesDir, resourcePathName);
			File routerEntryFile = new File(serviceDir, getResourceFileName());

			writeToFileCheck(instanceElement, routerEntryFile);
		}
	}
	
	protected String getResourceFileName() {
		return Axis2ProjectizerConstants.RESOURCE_FILE.replaceFirst(PLACE_HOLDER, String.valueOf(_resourceCounter++));
	}
	
	protected File copyTemplate(File destination) throws Exception {	
		URL url = Platform.getBundle(Activator.PLUGIN_ID).getEntry(EclipseAxis2ProjectizerConstants.WEBCONTENT_DIR_RESOURCE);
		url = FileLocator.toFileURL(url);
		
		File source = toFile(url);
		FileUtils.copyDirectory(source, destination);
		
		File webContentDir = new File(destination, source.getName());
		File webContentDestination = new File(webContentDir, "WEB-INF"); //$NON-NLS-1$
		
		for (int i=0; i < LIB_BUNDLE_IDS.length; i++) {		
			url = Platform.getBundle(LIB_BUNDLE_IDS[i]).getEntry(EclipseAxis2ProjectizerConstants.PROJECT_LIB_DIR_RESOURCE);
			url = FileLocator.toFileURL(url);
	
			File libSource = toFile(url);			
			FileUtils.copyDirectory(libSource, webContentDestination);
		}
		
		for (int i=0; i < MODULE_BUNDLE_IDS.length; i++) {		
			url = Platform.getBundle(MODULE_BUNDLE_IDS[i]).getEntry(EclipseAxis2ProjectizerConstants.PROJECT_MODULE_DIR_RESOURCE);
			url = FileLocator.toFileURL(url);
	
			File libSource = toFile(url);			
			FileUtils.copyDirectory(libSource, webContentDestination);
		}
		
		//
		//TODO: Hack to copy axis2-platform
		//this should be done in some cleaner way
		//
		
		url = Platform.getBundle(MODULE_BUNDLE_IDS[0]).getEntry("/lib/muse-platform-axis2-2.2.0.jar");
		url = FileLocator.toFileURL(url);

		File libSource = toFile(url);			
		FileUtils.copyFile(libSource, webContentDestination);
		
		File libDestination = new File(webContentDestination, "lib");
		
		if(_additionalJars != null) {
			for (int i=0; i < _additionalJars.length; i++) {
				if(!_additionalJars[i].exists()) {
					throw new FileNotFoundException(_additionalJars[i].getAbsolutePath());
				}
				
				FileUtils.copyFile(_additionalJars[i], libDestination);
			}
		}
		
		for (int i=0; i < _filesToCopy.length; i++) {
			String dest = _filesToCopy[i].getRelativePath();
			File destDir = new File(webContentDir, dest);
			String[] files = _filesToCopy[i].getFiles();
			
			for (int j=0; j < files.length; j++) {
				File file = new File(files[j]);
				if(!file.exists()) {
					throw new FileNotFoundException(file.getAbsolutePath());
				}
				
				FileUtils.copyFile(file, destDir);
			}
		}

		return webContentDir;	
	}
	private File toFile(URL url) throws Exception{

		return new File(url.getFile());
	}
}




/*******************************************************************************
 * Copyright (c) 2007 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:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.tptp.wsdm.tooling.internal.projectizer;


public interface EclipseAxis2ProjectizerConstants {
	
	String RESOURCES_DIR = "/resources/axis2/"; //$NON-NLS-1$
	
	String BUILD_FILE_RESOURCE = RESOURCES_DIR + "build.xml"; //$NON-NLS-1$
	
	String BUILD_FILE = "build.xml"; //$NON-NLS-1$

	String LAUNCH_FILE_RESOURCE = RESOURCES_DIR + ".externalToolBuilders/jarBuilder.launch"; //$NON-NLS-1$

	String WEBCONTENT_DIR_RESOURCE = RESOURCES_DIR + "WebContent"; //$NON-NLS-1$

	String PROJECT_LIB_DIR_RESOURCE = "/lib"; //$NON-NLS-1$
	
	String PROJECT_MODULE_DIR_RESOURCE = "/modules"; //$NON-NLS-1$

	String JAVA_BIN_DIR = "bin"; //$NON-NLS-1$

}






import java.io.File;
import java.net.URI;

import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;

	private IProject _project;

	public WebProjectHelper(String name, String location, String binDir, String sourceDir) throws Exception {
		_project = getProject(location, name, null, false);
		
		IDataModel dataModel = DataModelFactory.createDataModel(IWebFacetInstallDataModelProperties.class);   
		dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, name);     

		return _project;
	}

	public void setSuspendValidation(boolean shouldSuspend) {
		ValidatorManager.getManager().suspendValidation(getProject(), shouldSuspend);
	}
	




            container="Axis2"
            platform="J2EE"/>
      <projectizer
            class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseJ2EEAxis2Projectizer"
            name="Axis2 J2EE"
            servicePath="/services"
            servicePort="8080"/>

         point="org.eclipse.ui.startup">
      <startup class="org.eclipse.tptp.wsdm.tooling.internal.codegeneration.Activator"/>
   </extension>
   <extension
         point="org.eclipse.tptp.wsdm.editor.codeGeneration">
      <description
            container="Mini"
            platform="J2EE">
      </description>
      <projectizer
            class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseJ2EEMiniProjectizer"
            name="J2EE Mini"
            servicePort="8080">
      </projectizer>
   </extension>
</plugin>

Added Link Here

(-)resources/mini/build.xml (+10 lines)
1	<?xml version="1.0"?>
2	<project name="project" default="default">
3	<target name="default">
4	<jar destfile="${basedir}/WebContent/WEB-INF/lib/capability.jar">
5	<fileset dir="bin">
6	<include name="*/.class"/>
7	</fileset>
8	</jar>
9	</target>
10	</project>




/*******************************************************************************
 * Copyright (c) 2007 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:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.tptp.wsdm.tooling.internal.projectizer;


import java.io.File;
import java.io.FileNotFoundException;
import java.net.URL;
import java.util.Map;

import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
import org.apache.muse.tools.generator.projectizer.J2EEAxis2Projectizer;
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ServicesDescriptorHelper;
import org.apache.muse.util.FileUtils;
import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
import org.apache.muse.ws.wsdl.WsdlUtils;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.tptp.wsdm.tooling.codegen.mrt.provisional.EclipseConfigurationData;
import org.eclipse.tptp.wsdm.tooling.codegen.mrt.provisional.TargetedFileList;
import org.eclipse.tptp.wsdm.tooling.internal.codegeneration.Activator;
import org.eclipse.tptp.wsdm.tooling.internal.util.WebProjectHelper;
import org.eclipse.tptp.wsdm.tooling.provisional.util.ProgressMonitorHelper;
import org.eclipse.tptp.wsdm.tooling.provisional.util.ProjectHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

/**
 * Construct the projectizer for code generation
 */
public class EclipseJ2EEAxis2Projectizer extends J2EEAxis2Projectizer {
	
	
	private static final String CONTAINER_BUNDLE = "org.apache.muse.tools";//$NON-NLS-1$
	private static final String CONTAINER_RESOURCE = "/containers/muse-platform-axis2-2.2.0.jar";//$NON-NLS-1$
		
	
	private static final String[] LIB_BUNDLE_IDS = { 
		"org.apache.muse.api", //$NON-NLS-1$
		"org.apache.muse.impl", //$NON-NLS-1$
		"org.apache.muse.core", //$NON-NLS-1$
		"org.apache.muse.tools", //$NON-NLS-1$
		"org.apache.muse.utils" //$NON-NLS-1$
		};
	
	private static final String[] MODULE_BUNDLE_IDS = { 
		"org.apache.muse.tools", //$NON-NLS-1$
		};
	
	private File[] _additionalJars;
	private Object[][] _instances;
	private IProgressMonitor _progressMonitor;
	private TargetedFileList[] _filesToCopy;

	private int _resourceCounter = 0;

	private String _projectName;

	private String _projectLocation;
	
	public void projectize(ConfigurationData configuration) throws Exception {
		
		ConfigurationData.checkConfiguration(this, configuration);
		loadParameters(configuration);
		ProgressMonitorHelper progressHelper = new ProgressMonitorHelper(_progressMonitor);	
		try {
			
		progressHelper.startProgressMonitor(10);

		WebProjectHelper helper = createProject();
		
		_targetDirectory = helper.getProjectDirectory();		
		
		progressHelper.recordProgress();
		
		helper.setSuspendValidation(true);

		File webContentDir = copyTemplate(_targetDirectory);
		progressHelper.recordProgress();
						
		File descriptorFile = new File(
				webContentDir, 
				Axis2ProjectizerConstants.DESCRIPTOR_FILE);
		
		File javaSourceDir = new File(
				_targetDirectory, 
				Axis2ProjectizerConstants.JAVA_SRC_DIR);
		
		createJavaSources(javaSourceDir, _filesMaps);
		progressHelper.recordProgress();
		
		File wsdldir = new File(
				webContentDir, 
				Axis2ProjectizerConstants.WSDL_DIR);

		File routerEntriesDir = new File(webContentDir,Axis2ProjectizerConstants.ROUTER_ENTRIES_DIR);
		
		ServicesDescriptorHelper servicesHelper = new ServicesDescriptorHelper();
				
		createBuildFile(_targetDirectory, EclipseJ2EEAxis2ProjectizerConstants.BUILD_FILE_RESOURCE, EclipseJ2EEAxis2ProjectizerConstants.BUILD_FILE);
		progressHelper.recordProgress();
		
		for(int i=0; i < _capabilitiesList.length; i++) {
			Map capabilities = _capabilitiesList[i];
			Document wsdl = _wsdls[i];
			createDescriptor(_descriptor, wsdl, descriptorFile, capabilities, Axis2ProjectizerConstants.WSDL_RELATIVE_PATH, i);						
			MetadataDescriptor rmd = _metadatas[i];
			createRMDFile(rmd, wsdl, wsdldir);
			createWSDLFile(wsdl, wsdldir);
			if(_instances == null) {
				createRouterEntries(routerEntriesDir, WsdlUtils.getServiceName(wsdl.getDocumentElement()), _capabilitiesList[i]);
			}
			updateServicesDescriptor(servicesHelper, wsdl, capabilities);
		}		
					
		if(_instances != null) {
			createRouterEntries(routerEntriesDir, _instances);
		}
		progressHelper.recordProgress(4);
		
		File servicesFile = new File(webContentDir, Axis2ProjectizerConstants.SERVICES_FILE);
		createServicesDescriptor(servicesHelper, servicesFile);
		progressHelper.recordProgress();
		
		helper.refreshProject();
		progressHelper.recordProgress();
		
		helper.setSuspendValidation(false);
		} finally {
			progressHelper.finishProgressMonitor();
		}
	}	

	protected void loadParameters(ConfigurationData data) {
		super.loadParameters(data);
		
		_additionalJars = (File[])data.getParameter(EclipseConfigurationData.ADDITIONAL_JARS);
		_instances = (Object[][])data.getParameter(EclipseConfigurationData.INSTANCES);	
		_progressMonitor = (IProgressMonitor)data.getParameter(EclipseConfigurationData.PROGRESS_MONITOR);
		_filesToCopy = (TargetedFileList[])data.getParameter(EclipseConfigurationData.AXIS2_FILES);
		_projectName = (String)data.getParameter(EclipseConfigurationData.PROJECT_NAME);
		_projectLocation = (String)data.getParameter(EclipseConfigurationData.PROJECT_LOCATION);		
	}

	private WebProjectHelper createProject() throws Exception {
		WebProjectHelper helper = new WebProjectHelper(_projectName, _projectLocation, EclipseJ2EEAxis2ProjectizerConstants.JAVA_BIN_DIR, Axis2ProjectizerConstants.JAVA_SRC_DIR);
		
		return helper;
	}
	
	protected void createRouterEntries(File routerEntriesDir,Object[][] instances) throws Exception {
		routerEntriesDir.mkdirs();
		
		for (int i = 0; i < _instances.length; i++) {
			Object[] instancePair = _instances[i];

			//
			// This is really tacky, but it's the only real way to do this
			// since there are no pairs. The File use is to get the last element
			// of the path in a nice, non-hack way.
			//
			String path = (String) instancePair[0];
			String resourcePathName = new File(path).getName();

			Element instanceElement = (Element) instancePair[1];

			File serviceDir = new File(routerEntriesDir, resourcePathName);
			File routerEntryFile = new File(serviceDir, getResourceFileName());

			writeToFileCheck(instanceElement, routerEntryFile);
		}
	}
	
	protected String getResourceFileName() {
		return Axis2ProjectizerConstants.RESOURCE_FILE.replaceFirst(PLACE_HOLDER, String.valueOf(_resourceCounter++));
	}
	
	protected File copyTemplate(File destination) throws Exception {	
		URL url = Platform.getBundle(Activator.PLUGIN_ID).getEntry(EclipseJ2EEAxis2ProjectizerConstants.WEBCONTENT_DIR_RESOURCE);
		url = FileLocator.toFileURL(url);
		
		File source = ProjectHelper.toFile(url);
		FileUtils.copyDirectory(source, destination);
		
		File webContentDir = new File(destination, source.getName());
		File webContentDestination = new File(webContentDir, "WEB-INF"); //$NON-NLS-1$
		
		for (int i=0; i < LIB_BUNDLE_IDS.length; i++) {		
			url = Platform.getBundle(LIB_BUNDLE_IDS[i]).getEntry(EclipseJ2EEAxis2ProjectizerConstants.PROJECT_LIB_DIR_RESOURCE);
			url = FileLocator.toFileURL(url);
	
			File libSource = ProjectHelper.toFile(url);			
			FileUtils.copyDirectory(libSource, webContentDestination);
		}
		
		for (int i=0; i < MODULE_BUNDLE_IDS.length; i++) {		
			url = Platform.getBundle(MODULE_BUNDLE_IDS[i]).getEntry(EclipseJ2EEAxis2ProjectizerConstants.PROJECT_MODULE_DIR_RESOURCE);
			url = FileLocator.toFileURL(url);
	
			File libSource = ProjectHelper.toFile(url);			
			FileUtils.copyDirectory(libSource, webContentDestination);
		}
				
		File libDestination = new File(webContentDestination, "lib");
		
		url = Platform.getBundle(CONTAINER_BUNDLE).getEntry(CONTAINER_RESOURCE);
		url = FileLocator.toFileURL(url);
		
		File libSource = ProjectHelper.toFile(url);			
		FileUtils.copy(libSource, libDestination);		
		
		if(_additionalJars != null) {
			for (int i=0; i < _additionalJars.length; i++) {
				if(!_additionalJars[i].exists()) {
					throw new FileNotFoundException(_additionalJars[i].getAbsolutePath());
				}
				
				FileUtils.copyFile(_additionalJars[i], libDestination);
			}
		}
		
		for (int i=0; i < _filesToCopy.length; i++) {
			String dest = _filesToCopy[i].getRelativePath();
			File destDir = new File(webContentDir, dest);
			String[] files = _filesToCopy[i].getFiles();
			
			for (int j=0; j < files.length; j++) {
				File file = new File(files[j]);
				if(!file.exists()) {
					throw new FileNotFoundException(file.getAbsolutePath());
				}
				
				FileUtils.copyFile(file, destDir);
			}
		}

		return webContentDir;	
	}
}




/*******************************************************************************
 * Copyright (c) 2007 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:
 * 	Balan Subramanian (bsubram@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.tptp.wsdm.tooling.internal.projectizer;


public interface EclipseJ2EEAxis2ProjectizerConstants {
	
	String RESOURCES_DIR = "/resources/axis2/"; //$NON-NLS-1$
	
	String BUILD_FILE_RESOURCE = RESOURCES_DIR + "build.xml"; //$NON-NLS-1$
	
	String BUILD_FILE = "build.xml"; //$NON-NLS-1$

	String LAUNCH_FILE_RESOURCE = RESOURCES_DIR + ".externalToolBuilders/jarBuilder.launch"; //$NON-NLS-1$

	String WEBCONTENT_DIR_RESOURCE = RESOURCES_DIR + "WebContent"; //$NON-NLS-1$

	String PROJECT_LIB_DIR_RESOURCE = "/lib"; //$NON-NLS-1$
	
	String PROJECT_MODULE_DIR_RESOURCE = "/modules"; //$NON-NLS-1$

	String JAVA_BIN_DIR = "bin"; //$NON-NLS-1$

}




<?xml version="1.0" encoding="UTF-8"?>
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
	<display-name>Apache Muse Servlet</display-name>
	<servlet>
		<display-name>Apache Muse Servlet</display-name>
		<servlet-name>ApacheMuseServlet</servlet-name>
		<servlet-class>org.apache.muse.core.platform.mini.MiniServlet</servlet-class>
	</servlet>
	<servlet-mapping>
		<servlet-name>ApacheMuseServlet</servlet-name>
		<url-pattern>/*</url-pattern>
	</servlet-mapping>
</web-app>




/*******************************************************************************
 * Copyright (c) 2007 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:
 * 	Andrew Eberbach (aeberbac@us.ibm.com)
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.tptp.wsdm.tooling.internal.projectizer;

public interface EclipseJ2EEMiniProjectizerConstants {

	String RESOURCE_FILE = "resource-instance-XXX.xml";//$NON-NLS-1$
	String WSDL_RELATIVE_PATH = "/wsdl/";//$NON-NLS-1$
	
	String JAVA_SRC_DIR = "JavaSource/";//$NON-NLS-1$
	String WEBCONTENT_DIR = "WebContent/";//$NON-NLS-1$
	String WEBINF_DIR = WEBCONTENT_DIR + "WEB-INF/";//$NON-NLS-1$
	
	String JAVA_BIN_DIR = "/bin";//$NON-NLS-1$
	String JAVA_CLASSES_DIR = WEBINF_DIR + "classes/";//$NON-NLS-1$
	String DESCRIPTOR_FILE = JAVA_CLASSES_DIR + "muse.xml";//$NON-NLS-1$			
	String WSDL_DIR = JAVA_CLASSES_DIR + "wsdl/";//$NON-NLS-1$
	String ROUTER_ENTRIES_DIR = JAVA_CLASSES_DIR + "router-entries/";//$NON-NLS-1$
	
	String RESOURCES_DIR = "/resources/mini/";//$NON-NLS-1$
	String WEBXML_RESOURCE = RESOURCES_DIR + "web.xml";//$NON-NLS-1$
	String WEBXML_FILE = "web.xml";//$NON-NLS-1$
	String PROJECT_LIB_DIR_RESOURCE = "/lib/";//$NON-NLS-1$
	String WEBINFLIB_DIR = WEBINF_DIR + "lib/";//$NON-NLS-1$
	String BUILD_FILE_RESOURCE = RESOURCES_DIR + "build.xml"; //$NON-NLS-1$;
	String BUILD_FILE = "build.xml";
}

Return to bug 179329

Lines 24-27 Link Here

(-)plugin.xml (+13 lines)
24	servicePath="/"	24	servicePath="/"
25	servicePort="80"/>	25	servicePort="80"/>
26	</extension>	26	</extension>
		27	<extension
		28	point="org.eclipse.tptp.wsdm.editor.codeGeneration">
		29	<description
		30	container="Mini"
		31	platform="OSGi">
		32	</description>
		33	<projectizer
		34	class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseOsgiProjectizer"
		35	name="OSGi mini"
		36	servicePath="/"
		37	servicePort="80">
		38	</projectizer>
		39	</extension>
27	</plugin>	40	</plugin>

Lines 34-39 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/provisional/GenerationOptionsPage.java (-42 / +59 lines)
34	import org.eclipse.core.runtime.Path;	34	import org.eclipse.core.runtime.Path;
35	import org.eclipse.core.runtime.Platform;	35	import org.eclipse.core.runtime.Platform;
36	import org.eclipse.jface.dialogs.DialogPage;	36	import org.eclipse.jface.dialogs.DialogPage;
		37	import org.eclipse.jface.preference.IPreferenceStore;
37	import org.eclipse.jface.util.Util;	38	import org.eclipse.jface.util.Util;
38	import org.eclipse.jface.wizard.WizardPage;	39	import org.eclipse.jface.wizard.WizardPage;
39	import org.eclipse.osgi.util.TextProcessor;	40	import org.eclipse.osgi.util.TextProcessor;
Lines 56-62 Link Here
56	import org.eclipse.tptp.wsdm.tooling.editor.internal.Activator;	57	import org.eclipse.tptp.wsdm.tooling.editor.internal.Activator;
57	import org.eclipse.tptp.wsdm.tooling.editor.mrt.relationship.dialog.internal.MemoryComboBox;	58	import org.eclipse.tptp.wsdm.tooling.editor.mrt.relationship.dialog.internal.MemoryComboBox;
58	import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;	59	import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;
		60	import org.eclipse.tptp.wsdm.tooling.preferences.internal.Axis2ServerLocationPreferencePage;
59	import org.eclipse.tptp.wsdm.tooling.util.internal.Validation;	61	import org.eclipse.tptp.wsdm.tooling.util.internal.Validation;
		62	import org.eclipse.tptp.wsdm.tooling.validation.util.internal.ValidationUtils;
60		63
61	/**	64	/**
62	* This wizard enables the use to specify the projectizer options and also the	65	* This wizard enables the use to specify the projectizer options and also the
Lines 94-105 Link Here
94		97
95	private Label _containerLabel;	98	private Label _containerLabel;
96		99
		100	private Listener _containerComboListener = new Listener() {
		101
		102	public void handleEvent(Event event) {
		103	dialogChanged();
		104	}
		105
		106	};
		107
97	public GenerationOptionsPage() {	108	public GenerationOptionsPage() {
98	super("wizardPage");	109	super("wizardPage");
99	setTitle(Messages.HOOKUP_WIZARD_TXT1);	110	setTitle(Messages.HOOKUP_WIZARD_TXT1);
100	setDescription(Messages.HOOKUP_WIZARD_TXT2);	111	setDescription(Messages.HOOKUP_WIZARD_TXT2);
101		112
102	loadExtensionData();	113	loadExtensionData();
		114	setPageComplete(false);
103	}	115	}
104		116
105	private void loadExtensionData() {	117	private void loadExtensionData() {
Lines 109-115 Link Here
109		121
110	for (int i = 0; i < extensions.length; i++) {	122	for (int i = 0; i < extensions.length; i++) {
111	IConfigurationElement[] elements = extensions[i].getConfigurationElements();	123	IConfigurationElement[] elements = extensions[i].getConfigurationElements();
112	CodeGenerationData codeGenData = new CodeGenerationData(elements);	124	CodeGenerationData codeGenData = new CodeGenerationData(elements);
113	updatePlatformContainerMap(codeGenData);	125	updatePlatformContainerMap(codeGenData);
114	}	126	}
115	}	127	}
Lines 138-144 Link Here
138		150
139	public void createControl(Composite parent) {	151	public void createControl(Composite parent) {
140	setControl(doLayout(parent));	152	setControl(doLayout(parent));
141	dialogChanged();
142	}	153	}
143		154
144	private Composite doLayout(Composite parent) {	155	private Composite doLayout(Composite parent) {
Lines 273-278 Link Here
273	Combo combo = new Combo(page, SWT.BORDER \| SWT.READ_ONLY);	284	Combo combo = new Combo(page, SWT.BORDER \| SWT.READ_ONLY);
274	combo.setEnabled(false);	285	combo.setEnabled(false);
275		286
		287	combo.addListener(SWT.Modify, _containerComboListener);
276	return combo;	288	return combo;
277	}	289	}
278		290
Lines 465-471 Link Here
465	{	477	{
466	public void handleEvent(Event e)	478	public void handleEvent(Event e)
467	{	479	{
468	setLocationForSelection();
469	dialogChanged();	480	dialogChanged();
470	}	481	}
471	};	482	};
Lines 475-480 Link Here
475	String platform = _projectizerCombo.getText();	486	String platform = _projectizerCombo.getText();
476		487
477	Map containerCodeGenDataMap = (Map) _platformContainerMap.get(platform);	488	Map containerCodeGenDataMap = (Map) _platformContainerMap.get(platform);
		489	_containerCombo.removeListener(SWT.Modify, _containerComboListener);
478	_containerCombo.removeAll();	490	_containerCombo.removeAll();
479		491
480	boolean hasContainers = containerCodeGenDataMap.size() != 0;	492	boolean hasContainers = containerCodeGenDataMap.size() != 0;
Lines 486-506 Link Here
486	_containerCombo.select(0);	498	_containerCombo.select(0);
487	}	499	}
488		500
		501	_containerCombo.addListener(SWT.Modify, _containerComboListener);
489	_containerCombo.setEnabled(hasContainers);	502	_containerCombo.setEnabled(hasContainers);
490	_containerLabel.setEnabled(hasContainers);	503	_containerLabel.setEnabled(hasContainers);
491		504
492	dialogChanged();	505	dialogChanged();
493	}	506	}
494	};	507	};
495
496	void setLocationForSelection()
497	{
498	// _locationArea.updateProjectName(getProjectNameFieldValue());
499	}
500		508
		509	private TargetedFileList[] _filesToCopy;
		510
501	protected void dialogChanged()	511	protected void dialogChanged()
502	{	512	{
503	if(true) return;
504	String prjName = getProjectName();	513	String prjName = getProjectName();
505		514
506	if (prjName.length() == 0)	515	if (prjName.length() == 0)
Lines 526-533 Link Here
526	return;	535	return;
527	}	536	}
528		537
529	canFlipToNextPage();
530
531	updateStatus(null, DialogPage.NONE);	538	updateStatus(null, DialogPage.NONE);
532	}	539	}
533		540
Lines 551-557 Link Here
551		558
552	public boolean shouldPersistArtifacts()	559	public boolean shouldPersistArtifacts()
553	{	560	{
554	return _persistExtraArtifactsButton.isEnabled();	561	return _persistExtraArtifactsButton.getSelection();
555	}	562	}
556		563
557	/**	564	/**
Lines 632-668 Link Here
632		639
633	return baseAddress;	640	return baseAddress;
634	}	641	}
635
636	/**
637	* Checks to see if the Next Page can be enabled or not.
638	*/
639	public boolean canFlipToNextPage(){
640	return true;
641	// Axis2ServerLocationPage nextPage = (Axis2ServerLocationPage)this.getNextPage();
642	// if(isPageComplete() && isAxis2Project())
643	// {
644	// nextPage.makePageComplete(false);
645	// String userLocation = nextPage.getUserDefinedLocation();
646	// if(userLocation != null && userLocation.trim().length() > 0)
647	// {
648	// nextPage._serverNameField.setText(userLocation);
649	// }else
650	// {
651	// nextPage._serverNameField.setText(nextPage.getPreferenceServerLocation());
652	// }
653	//
654	// return true;
655	// }
656	//
657	// nextPage.makePageComplete(true);
658	//
659	// return false;
660	}
661		642
662	/**	643	public boolean canFlipToNextPage() {
663	* Returns whether the new Project to be created is a Axis2 project	644	return isPageComplete() && isAxis2Project();
664	* @return	645	}
665	*/
666	public boolean isAxis2Project(){	646	public boolean isAxis2Project(){
667	String container = getSelectedData().getContainer();	647	String container = getSelectedData().getContainer();
668	return container != null && container.equals("Axis2");	648	return container != null && container.equals("Axis2");
Lines 671-674 Link Here
671	public void saveCombo() {	651	public void saveCombo() {
672	MemoryComboBox.save(_projectNameField, PROJECT_MEMORY_COMBO_ID, Preferences.userNodeForPackage(GenerationOptionsPage.class));	652	MemoryComboBox.save(_projectNameField, PROJECT_MEMORY_COMBO_ID, Preferences.userNodeForPackage(GenerationOptionsPage.class));
673	}	653	}
		654
		655	private String validateLocation()
		656	{
		657	String serverHome = getPreferenceServerLocation();
		658
		659	ISoapServerDependency axisValidators[] = ValidationUtils.getAllAxisValidators();
		660	for(int i = 0 ; i < axisValidators.length ; i++){
		661
		662	ISoapServerDependency axis2Dependency = (Axis2ServerDependency)axisValidators[i];
		663	String errorMessage = axis2Dependency.validateSoapServerHome(serverHome);
		664	if(errorMessage!=null)
		665	return errorMessage;
		666	_filesToCopy = axis2Dependency.getFilesToCopy();
		667	if(_filesToCopy == null)
		668	_filesToCopy = new TargetedFileList[0];
		669	}
		670	return null;
		671	}
		672
		673	/**
		674	* Returns the Axis2 files to copied to generated code
		675	* @return
		676	*/
		677	public TargetedFileList[] getAxis2FilesToCopy()
		678	{
		679	validateLocation();
		680	return _filesToCopy;
		681	}
		682
		683	protected String getPreferenceServerLocation()
		684	{
		685	IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
		686	String location = store.getString(Axis2ServerLocationPreferencePage.SERVER_LOCATION_PREFERENCE_KEY).trim();
		687	if(location != null && !location.equals(""))
		688	return location;
		689	return "";
		690	}
674	}	691	}

Lines 64-71 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/provisional/NewProjectWizard.java (-15 / +8 lines)
64		64
65	private GenerationOptionsPage _generationOptionsPage;	65	private GenerationOptionsPage _generationOptionsPage;
66		66
67	private Axis2ServerLocationPage _axis2ServerLocationPage;
68
69	private String _projectName;	67	private String _projectName;
70		68
71	private boolean _overwrite;	69	private boolean _overwrite;
Lines 115-123 Link Here
115	_generationOptionsPage = new GenerationOptionsPage();	113	_generationOptionsPage = new GenerationOptionsPage();
116	addPage(_generationOptionsPage);	114	addPage(_generationOptionsPage);
117		115
118	_axis2ServerLocationPage = new Axis2ServerLocationPage();
119	addPage(_axis2ServerLocationPage);
120
121	// TODO AME why is this hardcoded here? why is it getting reloaded?	116	// TODO AME why is this hardcoded here? why is it getting reloaded?
122	Image imgTP = EclipseUtils.loadImage(PlatformUI.getWorkbench().getDisplay(),	117	Image imgTP = EclipseUtils.loadImage(PlatformUI.getWorkbench().getDisplay(),
123	"icons/wizban/newEndpointProject_wiz.gif");	118	"icons/wizban/newEndpointProject_wiz.gif");
Lines 151-157 Link Here
151	_serverLocation);	146	_serverLocation);
152	// Update the Lib and module location	147	// Update the Lib and module location
153	}	148	}
154	_requiredAxis2Files = _axis2ServerLocationPage.getAxis2FilesToCopy();	149	_requiredAxis2Files = _generationOptionsPage.getAxis2FilesToCopy();
155	} catch (Exception e) {	150	} catch (Exception e) {
156	throw new RuntimeException(e);	151	throw new RuntimeException(e);
157	}	152	}
Lines 214-228 Link Here
214	_projectLocation = _generationOptionsPage.getProjectLocation();	209	_projectLocation = _generationOptionsPage.getProjectLocation();
215		210
216	if (_isAxis2Project) {	211	if (_isAxis2Project) {
217	_serverLocation = _axis2ServerLocationPage.getServerLocation();	212	_serverLocation = _generationOptionsPage.getPreferenceServerLocation();
218	updatePreference = _axis2ServerLocationPage.isUpdatePreference();
219	popupAxis2LicenseDialog();
220	}	213	}
221		214
222	IRunnableWithProgress runnable = new IRunnableWithProgress() {	215	IRunnableWithProgress runnable = new IRunnableWithProgress() {
223	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {	216	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
224	if (!_isAxis2Project \|\| _licenseAccepted)	217	performFinish(monitor);
225	performFinish(monitor);
226	}	218	}
227	};	219	};
228		220
Lines 303-313 Link Here
303		295
304	private void handle(String message, Exception e) {	296	private void handle(String message, Exception e) {
305	_generationOptionsPage.setErrorMessage(message);	297	_generationOptionsPage.setErrorMessage(message);
306	_axis2ServerLocationPage.setErrorMessage(message);
307
308	WsdmToolingLog.log(IStatus.ERROR, IStatus.OK, message, e);	298	WsdmToolingLog.log(IStatus.ERROR, IStatus.OK, message, e);
309	}	299	}
310		300
311	private void openTasksView() {	301	private void openTasksView() {
312	IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();	302	IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
313	ViewPart view = (ViewPart) page.findView(TASK_VIEW_ID);	303	ViewPart view = (ViewPart) page.findView(TASK_VIEW_ID);
Lines 323-327 Link Here
323	page.activate(view);	313	page.activate(view);
324	}	314	}
325	}	315	}
326		316
		317	public boolean canFinish() {
		318	return _generationOptionsPage.isPageComplete();
		319	}
327	}	320	}

Lines 7-13 Link Here

(-)plugin.xml (-1 / +13 lines)
7	container="Axis2"	7	container="Axis2"
8	platform="J2EE"/>	8	platform="J2EE"/>
9	<projectizer	9	<projectizer
10	class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseAxis2Projectizer"	10	class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseJ2EEAxis2Projectizer"
11	name="Axis2 J2EE"	11	name="Axis2 J2EE"
12	servicePath="/services"	12	servicePath="/services"
13	servicePort="8080"/>	13	servicePort="8080"/>
Lines 16-19 Link Here
16	point="org.eclipse.ui.startup">	16	point="org.eclipse.ui.startup">
17	<startup class="org.eclipse.tptp.wsdm.tooling.internal.codegeneration.Activator"/>	17	<startup class="org.eclipse.tptp.wsdm.tooling.internal.codegeneration.Activator"/>
18	</extension>	18	</extension>
		19	<extension
		20	point="org.eclipse.tptp.wsdm.editor.codeGeneration">
		21	<description
		22	container="Mini"
		23	platform="J2EE">
		24	</description>
		25	<projectizer
		26	class="org.eclipse.tptp.wsdm.tooling.internal.projectizer.EclipseJ2EEMiniProjectizer"
		27	name="J2EE Mini"
		28	servicePort="8080">
		29	</projectizer>
		30	</extension>
19	</plugin>	31	</plugin>

Added Link Here

(-)resources/mini/web.xml (+13 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
3	<display-name>Apache Muse Servlet</display-name>
4	<servlet>
5	<display-name>Apache Muse Servlet</display-name>
6	<servlet-name>ApacheMuseServlet</servlet-name>
7	<servlet-class>org.apache.muse.core.platform.mini.MiniServlet</servlet-class>
8	</servlet>
9	<servlet-mapping>
10	<servlet-name>ApacheMuseServlet</servlet-name>
11	<url-pattern>/*</url-pattern>
12	</servlet-mapping>
13	</web-app>