Attachment #152909 for bug #295946

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




               final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\">\n</web-app>"; //$NON-NLS-1$
               webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
               
               populateDefaultContent(project, fv);
           } catch (UnsupportedEncodingException e) {
        	   WebPlugin.logError(e);
           }

               final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"2.5\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n</web-app>"; //$NON-NLS-1$
               webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
           
               populateDefaultContent(project, fv);
               Runnable runnable = new Runnable(){
   
                   public void run() {
                       WebApp webApp = (WebApp) provider.getModelObject();
                       
                       // Add the display-name tag
                       DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
                       displayName.setValue(project.getName());
                       webApp.getDisplayNames().add(displayName);
                       
                       // welcome file list
                       List<String> welcomeFiles = Arrays.asList(
                               "index.html", //$NON-NLS-1$
                               "index.htm", //$NON-NLS-1$
                               "index.jsp", //$NON-NLS-1$
                               "default.html", //$NON-NLS-1$
                               "default.htm", //$NON-NLS-1$
                               "default.jsp" //$NON-NLS-1$
                       );
                       
                       // Add the welcome-file-list tag
                       WelcomeFileList welcomeFileList = WebFactory.eINSTANCE.createWelcomeFileList();
                       welcomeFileList.getWelcomeFiles().addAll(welcomeFiles); 
                       webApp.getWelcomeFileLists().add(welcomeFileList);
                   }
               };
               provider.modify(runnable, null);
           } catch (UnsupportedEncodingException e) {
        	   WebPlugin.logError(e);
           }
       }
   }


	private void populateDefaultContent(final IProject project,
			final IProjectFacetVersion fv) {
		final IModelProvider provider = ModelProviderManager.getModelProvider(project, fv);
		   Runnable runnable = new Runnable(){
   
		       public void run() {
		           WebApp webApp = (WebApp) provider.getModelObject();
		           
		           // Add the display-name tag
		           DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
		           displayName.setValue(project.getName());
		           webApp.getDisplayNames().add(displayName);
		           
		           // welcome file list
		           List<String> welcomeFiles = Arrays.asList(
		                   "index.html", //$NON-NLS-1$
		                   "index.htm", //$NON-NLS-1$
		                   "index.jsp", //$NON-NLS-1$
		                   "default.html", //$NON-NLS-1$
		                   "default.htm", //$NON-NLS-1$
		                   "default.jsp" //$NON-NLS-1$
		           );
		           
		           // Add the welcome-file-list tag
		           WelcomeFileList welcomeFileList = WebFactory.eINSTANCE.createWelcomeFileList();
		           welcomeFileList.getWelcomeFiles().addAll(welcomeFiles); 
		           webApp.getWelcomeFileLists().add(welcomeFileList);
		       }
		   };
		   provider.modify(runnable, null);
	}
	

	private static void mkdirs(final IFolder folder)

Lines 45-50 Link Here

(-)j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java (-2 / +36 lines)
45	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;	45	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
46	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;	46	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
47	import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;	47	import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
		48	import org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties;
48	import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;	49	import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
49	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;	50	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
50	import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;	51	import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
Lines 54-59 Link Here
54	import org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceImpl;	55	import org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceImpl;
55	import org.eclipse.jst.javaee.ejb.EJBJar;	56	import org.eclipse.jst.javaee.ejb.EJBJar;
56	import org.eclipse.jst.javaee.ejb.internal.util.EjbResourceImpl;	57	import org.eclipse.jst.javaee.ejb.internal.util.EjbResourceImpl;
		58	import org.eclipse.jst.javaee.jca.Connector;
		59	import org.eclipse.jst.javaee.jca.internal.util.JcaResourceImpl;
57	import org.eclipse.jst.javaee.web.WebApp;	60	import org.eclipse.jst.javaee.web.WebApp;
58	import org.eclipse.jst.javaee.web.internal.util.WebResourceImpl;	61	import org.eclipse.jst.javaee.web.internal.util.WebResourceImpl;
59	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;	62	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
Lines 263-268 Link Here
263	}	266	}
264		267
265	}	268	}
		269	public void testConnectorModel() throws Exception {
		270
		271	String projName = "TestEE6ConnectorProject";//$NON-NLS-1$
		272	createConnectorProject(projName);
		273
		274	EMFAttributeFeatureGenerator.reset();
		275	String modelPathURI = J2EEConstants.RAR_DD_URI;
		276	URI uri = URI.createURI(J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.JCA_CONTENT_FOLDER) + "/" + modelPathURI);
		277	ProjectResourceSet resSet = getResourceSet(projName);
		278
		279	JcaResourceImpl connectorRes = (JcaResourceImpl) resSet.getResource(uri,true);
		280	Assert.assertTrue(connectorRes.getContents().size() > 0);
		281
		282	if (connectorRes.getContents().size() > 0) {
		283	Connector connector = connectorRes.getConnector();
		284	populateRoot((EObjectImpl)connector);
		285	connectorRes.save(null);
		286	}
		287
		288	}
266	public void testWarModel() throws Exception {	289	public void testWarModel() throws Exception {
267		290
268	String projName = "TestEE6WarProject";//$NON-NLS-1$	291	String projName = "TestEE6WarProject";//$NON-NLS-1$
Lines 324-331 Link Here
324	addVersionProperties(dataModel, projName, facetVersion,IJ2EEFacetInstallDataModelProperties.ENTERPRISE_APPLICATION);	347	addVersionProperties(dataModel, projName, facetVersion,IJ2EEFacetInstallDataModelProperties.ENTERPRISE_APPLICATION);
325	dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);	348	dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
326	dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);	349	dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
327	IProject webProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);	350	IProject earProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
328	return webProj;	351	return earProj;
329	}	352	}
330	private IProject createAppClientProject(String projName) throws ExecutionException {	353	private IProject createAppClientProject(String projName) throws ExecutionException {
331	IDataModel dataModel = DataModelFactory.createDataModel(IAppClientFacetInstallDataModelProperties.class);	354	IDataModel dataModel = DataModelFactory.createDataModel(IAppClientFacetInstallDataModelProperties.class);
Lines 341-346 Link Here
341	IProject webProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);	364	IProject webProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
342	return webProj;	365	return webProj;
343	}	366	}
		367	private IProject createConnectorProject(String projName) throws ExecutionException {
		368	IDataModel dataModel = DataModelFactory.createDataModel(IConnectorFacetInstallDataModelProperties.class);
		369	String versionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionConstants.JCA_1_6_ID);
		370	IProjectFacet facet = ProjectFacetsManager.getProjectFacet(IConnectorFacetInstallDataModelProperties.JCA);
		371	IProjectFacetVersion facetVersion = facet.getVersion(versionString); //$NON-NLS-1$
		372	addVersionProperties(dataModel, projName, facetVersion,IJ2EEFacetInstallDataModelProperties.JCA);
		373	dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
		374	dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
		375	IProject connectorProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
		376	return connectorProj;
		377	}
344	protected IDataModel setupJavaInstallAction(String aProjectName, String srcFolder) {	378	protected IDataModel setupJavaInstallAction(String aProjectName, String srcFolder) {
345	IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());	379	IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
346	dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProjectName);	380	dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProjectName);

Lines 13-18 Link Here

(-)jee-models/org/eclipse/jst/javaee/jca/internal/util/JcaResourceImpl.java (+15 lines)
13	import org.eclipse.emf.common.util.URI;	13	import org.eclipse.emf.common.util.URI;
14		14
15	import org.eclipse.emf.ecore.EObject;	15	import org.eclipse.emf.ecore.EObject;
		16	import org.eclipse.emf.ecore.xmi.XMLHelper;
		17	import org.eclipse.emf.ecore.xmi.XMLLoad;
		18	import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;
16	import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;	19	import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
17	import org.eclipse.jst.javaee.jca.Connector;	20	import org.eclipse.jst.javaee.jca.Connector;
18	import org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor;	21	import org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor;
Lines 38-43 Link Here
38	super(uri);	41	super(uri);
39	}	42	}
40		43
		44	@Override
		45	protected XMLLoad createXMLLoad() {
		46	return new JEEXMLLoadImpl(createXMLHelper());
		47	}
		48
		49
		50	@Override
		51	protected XMLHelper createXMLHelper() {
		52
		53	return new JcaXMLHelperImpl(this);
		54	}
		55
41	/* (non-Javadoc)	56	/* (non-Javadoc)
42	* @see org.eclipse.jst.javaee.jca.IConnectorResource#getRootObject()	57	* @see org.eclipse.jst.javaee.jca.IConnectorResource#getRootObject()
43	*/	58	*/




/*******************************************************************************
 * Copyright (c) 2009 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.javaee.jca.internal.util;

import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl;
import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;

public class JcaXMLHelperImpl extends JEEXMLHelperImpl {

	public JcaXMLHelperImpl(XMLResource resource) {
		super(resource);
	}

	
	@Override
	public String getURI(String prefix) {
		if (prefix != null && prefix.equals("")) //$NON-NLS-1$
			return JcaPackage.eNS_URI;
		else
			return super.getURI(prefix);
	}
	@Override
	protected String getQName(EPackage ePackage, String name, boolean mustHavePrefix)
	  {
	   String nsPrefix = getPrefix(ePackage, mustHavePrefix);
	   // Not using EE5 package namespace - default jee5 namespace is used
	   if (nsPrefix.equals(JcaPackage.eNS_PREFIX)) 
	    {
	    	return name;
	    }
	    else return super.getQName(ePackage, name, mustHavePrefix);
	  }


}

Lines 15-17 Link Here

(-)plugin.properties (+1 lines)
15	ee5webContentType=Java EE 5 Web Content	15	ee5webContentType=Java EE 5 Web Content
16	ee5earContentType=Java EE 5 EAR Content	16	ee5earContentType=Java EE 5 EAR Content
17	ee5appclientContentType=Java EE 5 Application Client Content	17	ee5appclientContentType=Java EE 5 Application Client Content
		18	ee6connectorContentType=Java EE 6 Connector Content

Lines 38-43 Link Here

(-)plugin.xml (-2 / +32 lines)
38	contentTypeId="org.eclipse.jst.jee.ee5earDD">	38	contentTypeId="org.eclipse.jst.jee.ee5earDD">
39	</contentTypeBinding>	39	</contentTypeBinding>
40	</resourceFactory>	40	</resourceFactory>
		41	<resourceFactory
		42	class="org.eclipse.jst.javaee.jca.internal.util.JcaResourceFactoryImpl"
		43	isDefault="false"
		44	shortSegment="ra.xml">
		45	<contentTypeBinding
		46	contentTypeId="org.eclipse.jst.jee.ee6connectorDD">
		47	</contentTypeBinding>
		48	</resourceFactory>
41	</extension>	49	</extension>
42		50
43	<extension	51	<extension
Lines 170-176 Link Here
170	class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">	178	class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">
171	</describer>	179	</describer>
172	</content-type>	180	</content-type>
173	</extension>	181	</extension>
		182
		183	<extension
		184	point="org.eclipse.core.runtime.contentTypes">
		185	<content-type
		186	file-names="ra.xml"
		187	id="ee6connectorDD"
		188	base-type="org.eclipse.core.runtime.xml"
		189	name="%ee6connectorContentType"
		190	priority="high">
		191	<describer
		192	class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">
		193	</describer>
		194	</content-type>
		195	</extension>
174		196
175	<extension	197	<extension
176	point="org.eclipse.jst.j2ee.J2EEModelProvider">	198	point="org.eclipse.jst.j2ee.J2EEModelProvider">
Lines 187-191 Link Here
187	<facet id="jst.appclient" versions="5.0,6.0"/>	209	<facet id="jst.appclient" versions="5.0,6.0"/>
188	</provider>	210	</provider>
189	</extension>	211	</extension>
190		212
		213	<extension
		214	point="org.eclipse.jst.j2ee.J2EEModelProvider">
		215	<provider>
		216	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Connector16ModelProviderFactory"/>
		217	<facet id="jst.connector" versions="1.6"/>
		218	</provider>
		219	</extension>
		220
191	</plugin>	221	</plugin>




/*******************************************************************************
 * Copyright (c) 2009 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.jee.model.internal;

import org.eclipse.core.resources.IProject;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.IModelProviderFactory;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;

public class Connector16ModelProviderFactory implements IModelProviderFactory {

	public IModelProvider create(IProject project) {
		return new Connector16ModelProvider(project);
	}

	public IModelProvider create(IVirtualComponent component) {
		return new Connector16ModelProvider(component.getProject());
	}

}




/*******************************************************************************
 * Copyright (c) 2009 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.jee.model.internal;


import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.javaee.core.DisplayName;
import org.eclipse.jst.javaee.core.JavaeeFactory;
import org.eclipse.jst.javaee.jca.Connector;
import org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor;
import org.eclipse.jst.javaee.jca.IConnectorResource;
import org.eclipse.jst.javaee.jca.JcaFactory;

public class Connector16ModelProvider extends JEE5ModelProvider {

	private static final String CONNECTOR16_CONTENT_TYPE = "org.eclipse.jst.jee.ee6connectorDD"; //$NON-NLS-1$
	public Connector16ModelProvider(IProject proj) {
		super();
		this.proj = proj;
		setDefaultResourcePath(new Path(J2EEConstants.RAR_DD_URI));
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
	 */
	@Override
	public Object getModelObject(IPath modelPath) {
		IConnectorResource connectorRes = (IConnectorResource)getModelResource(modelPath);
		if (connectorRes != null && connectorRes.getRootObject() != null)
			return connectorRes.getConnector();
		return null;
	}
	@Override
	protected String getContentTypeDescriber() {
		return CONNECTOR16_CONTENT_TYPE;
	}
	@Override
	public void populateRoot(XMLResourceImpl res, String name) {
		ConnectorDeploymentDescriptor dd = JcaFactory.eINSTANCE.createConnectorDeploymentDescriptor();
		dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL);  //$NON-NLS-1$
		dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$

		Connector connector = JcaFactory.eINSTANCE.createConnector();
		DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
		dn.setValue(name);
		connector.getDisplayNames().add(dn);

		String version = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
		if(version != null && version.equals(J2EEVersionConstants.VERSION_1_6_TEXT)) {
			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.CONNECTOR_SCHEMA_LOC_1_6);
			connector.setVersion(J2EEVersionConstants.VERSION_1_6_TEXT);
		}
		else
		{
			// default to 1.6 for now
			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.CONNECTOR_SCHEMA_LOC_1_6);
			connector.setVersion(J2EEVersionConstants.VERSION_1_6_TEXT);
		}
		dd.setConnector(connector);
		res.getContents().add((EObject) dd);
	}

}

Lines 15-20 Link Here

(-)rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java (+6 lines)
15	import org.eclipse.jst.j2ee.internal.common.XMLResource;	15	import org.eclipse.jst.j2ee.internal.common.XMLResource;
16	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;	16	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
17	import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;	17	import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
		18	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
		19	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
18	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;	20	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
19	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;	21	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
20	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;	22	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
Lines 36-41 Link Here
36	public void init() {	38	public void init() {
37	super.init();	39	super.init();
38	//setIntProperty(IConnectorComponentCreationDataModelProperties.COMPONENT_VERSION, J2EEVersionConstants.J2EE_1_3_ID);	40	//setIntProperty(IConnectorComponentCreationDataModelProperties.COMPONENT_VERSION, J2EEVersionConstants.J2EE_1_3_ID);
		41	IDataModel componentCreationDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
		42	FacetDataModelMap map = (FacetDataModelMap) componentCreationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
		43	IDataModel connectorFacet = map.getFacetDataModel( IJ2EEFacetConstants.JCA );
		44	connectorFacet.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, false);
39	}	45	}
40		46
41	@Override	47	@Override

Lines 1-5 Link Here

(-)jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java (-5 / +50 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2006 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 19-24 Link Here
19	import org.eclipse.core.resources.IFile;	19	import org.eclipse.core.resources.IFile;
20	import org.eclipse.core.resources.IFolder;	20	import org.eclipse.core.resources.IFolder;
21	import org.eclipse.core.resources.IProject;	21	import org.eclipse.core.resources.IProject;
		22	import org.eclipse.core.resources.IResource;
22	import org.eclipse.core.resources.IWorkspace;	23	import org.eclipse.core.resources.IWorkspace;
23	import org.eclipse.core.resources.ResourcesPlugin;	24	import org.eclipse.core.resources.ResourcesPlugin;
24	import org.eclipse.core.runtime.CoreException;	25	import org.eclipse.core.runtime.CoreException;
Lines 39-48 Link Here
39	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;	40	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
40	import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;	41	import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
41	import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;	42	import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
		43	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
42	import org.eclipse.jst.j2ee.jca.Connector;	44	import org.eclipse.jst.j2ee.jca.Connector;
43	import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;	45	import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
		46	import org.eclipse.jst.j2ee.model.IModelProvider;
		47	import org.eclipse.jst.j2ee.model.ModelProviderManager;
		48	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
		49	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
44	import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;	50	import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
45	import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;	51	import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
		52	import org.eclipse.jst.javaee.core.DisplayName;
		53	import org.eclipse.jst.javaee.core.JavaeeFactory;
46	import org.eclipse.wst.common.componentcore.ComponentCore;	54	import org.eclipse.wst.common.componentcore.ComponentCore;
47	import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;	55	import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
48	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;	56	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
Lines 95-101 Link Here
95	IPath configFolderpath = pjpath.append(configFolderName);	103	IPath configFolderpath = pjpath.append(configFolderName);
96	sourceFolder = ws.getRoot().getFolder(configFolderpath);	104	sourceFolder = ws.getRoot().getFolder(configFolderpath);
97		105
98	if (!sourceFolder.getFile(J2EEConstants.RAR_DD_URI).exists()) {	106	if( fv == IJ2EEFacetConstants.JCA_16)
		107	{
		108	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
		109	// Create the deployment descriptor (ra.xml) if one doesn't exist
		110	IFile rarFile = sourceFolder.getFile(new Path(J2EEConstants.RAR_DD_URI));
		111	if (!rarFile.exists()) {
		112	try {
		113	if(!rarFile.getParent().exists()
		114	&& (rarFile.getParent().getType() == IResource.FOLDER)){
		115	((IFolder)rarFile.getParent()).create(true, true, monitor);
		116	}
		117	InputStream in = getClass().getResourceAsStream(CONNECTOR_XML_TEMPLATE_16);
		118	rarFile.create(in, true, monitor);
		119	populateDefaultContent(project, fv);
		120	} catch (CoreException e) {
		121	J2EEPlugin.logError(e);
		122	}
		123	}
		124	}
		125	}
		126	else if (!sourceFolder.getFile(J2EEConstants.RAR_DD_URI).exists()) {
99	String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);	127	String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
100	int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);	128	int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
101		129
Lines 109-117 Link Here
109	else if (nVer == J2EEVersionConstants.JCA_1_5_ID) {	137	else if (nVer == J2EEVersionConstants.JCA_1_5_ID) {
110	template = CONNECTOR_XML_TEMPLATE_15;	138	template = CONNECTOR_XML_TEMPLATE_15;
111	}	139	}
112	else {	140	// JCA 1.6 handled separately
113	template = CONNECTOR_XML_TEMPLATE_16;	141	// else {
114	}	142	// template = CONNECTOR_XML_TEMPLATE_16;
		143	// }
115		144
116	InputStream in = getClass().getResourceAsStream(template);	145	InputStream in = getClass().getResourceAsStream(template);
117	if (in != null) {	146	if (in != null) {
Lines 203-206 Link Here
203		232
204	}	233	}
205		234
		235	private void populateDefaultContent(final IProject project,
		236	final IProjectFacetVersion fv) {
		237	final IModelProvider provider = ModelProviderManager.getModelProvider(project, fv);
		238	Runnable runnable = new Runnable(){
		239
		240	public void run() {
		241	Connector connector = (Connector) provider.getModelObject();
		242
		243	// Add the display-name tag
		244	DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
		245	displayName.setValue(project.getName());
		246	connector.getDisplayNames().add(displayName);
		247	}
		248	};
		249	provider.modify(runnable, null);
		250	}
206	}	251	}

Lines 138-144 Link Here

(-)plugin.xml (-1 / +1 lines)
138	point="org.eclipse.jst.j2ee.J2EEModelProvider">	138	point="org.eclipse.jst.j2ee.J2EEModelProvider">
139	<provider>	139	<provider>
140	<modelProvider factoryClass="org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit"/>	140	<modelProvider factoryClass="org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit"/>
141	<facet id="jst.connector" versions="1.0,1.5,1.6"/>	141	<facet id="jst.connector" versions="1.0,1.5"/>
142	</provider>	142	</provider>
143	</extension>	143	</extension>
144	</plugin>	144	</plugin>

Return to bug 295946

Lines 215-221 Link Here

(-)webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java (-29 / +35 lines)
215	final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\">\n</web-app>"; //$NON-NLS-1$	215	final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\">\n</web-app>"; //$NON-NLS-1$
216	webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$	216	webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
217		217
218	// TODO do some stuff with the module	218	populateDefaultContent(project, fv);
219	} catch (UnsupportedEncodingException e) {	219	} catch (UnsupportedEncodingException e) {
220	WebPlugin.logError(e);	220	WebPlugin.logError(e);
221	}	221	}
Lines 232-270 Link Here
232	final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"2.5\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n</web-app>"; //$NON-NLS-1$	232	final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"2.5\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n</web-app>"; //$NON-NLS-1$
233	webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$	233	webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
234		234
235	final IModelProvider provider = ModelProviderManager.getModelProvider(project, fv);	235	populateDefaultContent(project, fv);
236	Runnable runnable = new Runnable(){
237
238	public void run() {
239	WebApp webApp = (WebApp) provider.getModelObject();
240
241	// Add the display-name tag
242	DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
243	displayName.setValue(project.getName());
244	webApp.getDisplayNames().add(displayName);
245
246	// welcome file list
247	List<String> welcomeFiles = Arrays.asList(
248	"index.html", //$NON-NLS-1$
249	"index.htm", //$NON-NLS-1$
250	"index.jsp", //$NON-NLS-1$
251	"default.html", //$NON-NLS-1$
252	"default.htm", //$NON-NLS-1$
253	"default.jsp" //$NON-NLS-1$
254	);
255
256	// Add the welcome-file-list tag
257	WelcomeFileList welcomeFileList = WebFactory.eINSTANCE.createWelcomeFileList();
258	welcomeFileList.getWelcomeFiles().addAll(welcomeFiles);
259	webApp.getWelcomeFileLists().add(welcomeFileList);
260	}
261	};
262	provider.modify(runnable, null);
263	} catch (UnsupportedEncodingException e) {	236	} catch (UnsupportedEncodingException e) {
264	WebPlugin.logError(e);	237	WebPlugin.logError(e);
265	}	238	}
266	}	239	}
267	}	240	}
		241
		242
		243	private void populateDefaultContent(final IProject project,
		244	final IProjectFacetVersion fv) {
		245	final IModelProvider provider = ModelProviderManager.getModelProvider(project, fv);
		246	Runnable runnable = new Runnable(){
		247
		248	public void run() {
		249	WebApp webApp = (WebApp) provider.getModelObject();
		250
		251	// Add the display-name tag
		252	DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
		253	displayName.setValue(project.getName());
		254	webApp.getDisplayNames().add(displayName);
		255
		256	// welcome file list
		257	List<String> welcomeFiles = Arrays.asList(
		258	"index.html", //$NON-NLS-1$
		259	"index.htm", //$NON-NLS-1$
		260	"index.jsp", //$NON-NLS-1$
		261	"default.html", //$NON-NLS-1$
		262	"default.htm", //$NON-NLS-1$
		263	"default.jsp" //$NON-NLS-1$
		264	);
		265
		266	// Add the welcome-file-list tag
		267	WelcomeFileList welcomeFileList = WebFactory.eINSTANCE.createWelcomeFileList();
		268	welcomeFileList.getWelcomeFiles().addAll(welcomeFiles);
		269	webApp.getWelcomeFileLists().add(welcomeFileList);
		270	}
		271	};
		272	provider.modify(runnable, null);
		273	}
268		274
269		275
270	private static void mkdirs(final IFolder folder)	276	private static void mkdirs(final IFolder folder)

Added Link Here

(-)jee-models/org/eclipse/jst/javaee/jca/internal/util/JcaXMLHelperImpl.java (+45 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 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.javaee.jca.internal.util;
12
13	import org.eclipse.emf.ecore.EPackage;
14	import org.eclipse.emf.ecore.xmi.XMLResource;
15	import org.eclipse.jst.javaee.core.internal.util.JEEXMLHelperImpl;
16	import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
17
18	public class JcaXMLHelperImpl extends JEEXMLHelperImpl {
19
20	public JcaXMLHelperImpl(XMLResource resource) {
21	super(resource);
22	}
23
24
25	@Override
26	public String getURI(String prefix) {
27	if (prefix != null && prefix.equals("")) //$NON-NLS-1$
28	return JcaPackage.eNS_URI;
29	else
30	return super.getURI(prefix);
31	}
32	@Override
33	protected String getQName(EPackage ePackage, String name, boolean mustHavePrefix)
34	{
35	String nsPrefix = getPrefix(ePackage, mustHavePrefix);
36	// Not using EE5 package namespace - default jee5 namespace is used
37	if (nsPrefix.equals(JcaPackage.eNS_PREFIX))
38	{
39	return name;
40	}
41	else return super.getQName(ePackage, name, mustHavePrefix);
42	}
43
44
45	}

Added Link Here

(-)jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProviderFactory.java (+28 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 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.jee.model.internal;
12
13	import org.eclipse.core.resources.IProject;
14	import org.eclipse.jst.j2ee.model.IModelProvider;
15	import org.eclipse.jst.j2ee.model.IModelProviderFactory;
16	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
17
18	public class Connector16ModelProviderFactory implements IModelProviderFactory {
19
20	public IModelProvider create(IProject project) {
21	return new Connector16ModelProvider(project);
22	}
23
24	public IModelProvider create(IVirtualComponent component) {
25	return new Connector16ModelProvider(component.getProject());
26	}
27
28	}