Author: rob.stryker(a)jboss.com
Date: 2012-02-23 02:20:01 -0500 (Thu, 23 Feb 2012)
New Revision: 39029
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EjbArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/J2EEArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ModulePackageTypeConverter.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java
Log:
JBIDE-11009 - removed the archive types, which have been deprecated and unused in UI or
and completely unsupported in API for several years.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2012-02-23
07:20:01 UTC (rev 39029)
@@ -33,7 +33,6 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.ide.eclipse.archives.webtools,
- org.jboss.ide.eclipse.archives.webtools.archivetypes,
org.jboss.ide.eclipse.archives.webtools.filesets,
org.jboss.ide.eclipse.archives.webtools.filesets.vcf,
org.jboss.ide.eclipse.archives.webtools.modules,
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.archivetypes;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
-import org.jboss.ide.eclipse.archives.webtools.modules.ModulePackageTypeConverter;
-
-/**
- * @author rob.stryker(a)redhat.com
- */
-public class EarArchiveType extends J2EEArchiveType {
- public final static String ID =
"org.jboss.ide.eclipse.as.core.packages.earPackageType"; //$NON-NLS-1$
- private static final String EXTENSION = ".ear"; //$NON-NLS-1$
- private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
-
- public String getAssociatedModuleType() {
- return "jst.ear"; //$NON-NLS-1$
- }
-
- public String getId() {
- return ID;
- }
-
- public String getLabel() {
- return "EAR"; //$NON-NLS-1$
- }
-
-
- public IArchive createDefaultConfiguration(String project, IProgressMonitor monitor) {
- IModule mod = getModule(project);
- if( mod != null )
- return createDefaultConfigFromModule(mod, monitor);
- else
- return createDefaultConfiguration2(project, monitor);
- }
-
- public IArchive createDefaultConfiguration2(String projectName,
- IProgressMonitor monitor) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- IArchive topLevel = createGenericIArchive(project, null, project.getName() +
EXTENSION);
- topLevel.setDestinationPath(new Path(project.getName()));
- topLevel.setInWorkspace(true);
-
- fillDefaultConfiguration(projectName, topLevel, monitor);
- return topLevel;
- }
-
- public IArchive createDefaultConfigFromModule(IModule module,
- IProgressMonitor monitor) {
- IProject project = module.getProject();
- IContainer sourceContainer = project.getFolder(EARCONTENT);
- IArchive topLevel = createGenericIArchive(project, null, project.getName() + EXTENSION,
sourceContainer);
- topLevel.setDestinationPath(new Path(project.getName()));
- topLevel.setInWorkspace(true);
-
- fillDefaultConfiguration(project.getName(), topLevel, monitor);
- return topLevel;
- }
-
- public IArchive fillDefaultConfiguration(String projectName, IArchive topLevel,
IProgressMonitor monitor) {
- try {
- IModule mod = getModule(projectName);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-
- if( mod == null ) {
- // add fileset
- IArchiveFolder metainf = addFolder(project, topLevel, METAINF);
- addFileset(project, metainf, new Path(projectName).append(METAINF).toOSString(),
null);
-
- } else {
- // now add children
- addFileset(project, topLevel, new
Path(project.getName()).append(EARCONTENT).toOSString(), "**/*.*");
//$NON-NLS-1$
- IEnterpriseApplication earModule =
(IEnterpriseApplication)mod.loadAdapter(IEnterpriseApplication.class, monitor);
- IModule[] childModules = earModule.getModules();
- for( int i = 0; i < childModules.length; i++ ) {
- IModule child = childModules[i];
- IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new
NullProgressMonitor());
- if( j2eeChild != null && !j2eeChild.isBinary()) {
- IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child);
- IArchive childPack;
- if( type == null ) {
- childPack = createGenericIArchive(child.getProject(), null,
child.getProject().getName() + JAR_EXTENSION);
- } else {
- if( new Path(childModules[i].getName()).segmentCount() > 1 )
- continue;
- childPack = type.createDefaultConfiguration(child.getProject().getName(), new
NullProgressMonitor());
- }
- if( childPack != null )
- topLevel.addChild(childPack);
- }
- }
- }
-
- } catch( ArchivesModelException ame) {}
- return topLevel;
- }
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EjbArchiveType.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EjbArchiveType.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EjbArchiveType.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.archivetypes;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-
-/**
- *
- * @author rob.stryker(a)redhat.com
- */
-public class EjbArchiveType extends J2EEArchiveType {
-
- public final static String ID =
"org.jboss.ide.eclipse.as.core.packages.ejbPackageType"; //$NON-NLS-1$
- public String getAssociatedModuleType() {
- return "jst.ejb"; //$NON-NLS-1$
- }
-
- public String getId() {
- return ID;
- }
-
- public String getLabel() {
- return "EJB JAR"; //$NON-NLS-1$
- }
-
- public IArchive createDefaultConfiguration(String projectName, IProgressMonitor monitor)
{
- IProject project = getProject(projectName);
- IArchive topLevel = createGenericIArchive(project, null, project.getName() +
".jar"); //$NON-NLS-1$
- return fillDefaultConfiguration(project, topLevel, monitor);
- }
-
- public IArchive fillDefaultConfiguration(String projectName, IArchive topLevel,
IProgressMonitor monitor) {
- return fillDefaultConfiguration(getProject(projectName), topLevel, monitor);
- }
- public IArchive fillDefaultConfiguration(IProject project, IArchive topLevel,
IProgressMonitor monitor) {
-
- IModule mod = getModule(project.getName());
-
- if( mod == null ) {
- // TODO fix me
- } else {
- if( mod.getModuleType().getId().equals("jst.ejb") ) { //$NON-NLS-1$
- try {
- IJavaProject proj = JavaCore.create(project);
- IPath outputLoc = proj.getOutputLocation();
- addFileset(project, topLevel, outputLoc.toOSString(), null);
- } catch( JavaModelException jmde) {
- } catch( ArchivesModelException ame ) {}
- }
- }
- return topLevel;
- }
-
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/J2EEArchiveType.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/J2EEArchiveType.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/J2EEArchiveType.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.archivetypes;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
-import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
-import
org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension;
-import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
-import org.jboss.ide.eclipse.archives.webtools.Messages;
-
-/**
- *
- * @author rob.stryker(a)jboss.com
- */
-public abstract class J2EEArchiveType implements IArchiveType {
- public static final String METAINF = "META-INF"; //$NON-NLS-1$
- public static final String WEBINF = "WEB-INF";//$NON-NLS-1$
- public static final String CLASSES = "classes";//$NON-NLS-1$
- public static final String LIB = "lib";//$NON-NLS-1$
- public static final String WEBCONTENT = "WebContent";//$NON-NLS-1$
- public static final String EARCONTENT = "EarContent";//$NON-NLS-1$
- public static final String EJBMODULE = "ejbModule";//$NON-NLS-1$
-
-
- protected boolean isModuleType(IModule module, String moduleTypeId){
- if(module.getModuleType()!=null &&
moduleTypeId.equals(module.getModuleType().getId()))
- return true;
- return false;
- }
-
- protected IModule getModule(String projectName) {
- IModuleArtifact moduleArtifacts[] =
ServerPlugin.getModuleArtifacts(getProject(projectName));
-
- if (moduleArtifacts != null && moduleArtifacts.length > 0)
- return moduleArtifacts[0].getModule();
- else return null;
- }
-
- protected IProject getProject(String projectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
- // Find the source folder, then create the IPackage appropriately
- public static IArchive createGenericIArchive(IProject project, String deployDirectory,
String packageName) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- Assert.isNotNull(javaProject);
-
- IPath sourcePath;
- try {
- sourcePath = javaProject.getOutputLocation();
- } catch (JavaModelException e) {
- return null;
- }
- sourcePath = sourcePath.removeFirstSegments(1);
- IContainer sourcePathContainer;
- if( sourcePath.segmentCount() == 0 )
- sourcePathContainer = project;
- else
- sourcePathContainer = project.getFolder(sourcePath);
- return createGenericIArchive(project, deployDirectory, packageName,
sourcePathContainer);
- } catch( Exception e ) {
- IntegrationPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
IntegrationPlugin.PLUGIN_ID, Messages.ExceptionUnexpectedException, e));
- }
- return null;
- }
-
- // Create a detached package with some generic settings
- public static IArchive createGenericIArchive(IProject project, String deployDirectory,
String packageName, IContainer sourceContainer) {
- IArchive jar = ArchivesCore.getInstance().getNodeFactory().createArchive();
-
- if( deployDirectory != null ) {
- jar.setDestinationPath(new Path(deployDirectory));
- jar.setInWorkspace(ResourcesPlugin.getWorkspace().getRoot().getLocation().isPrefixOf(new
Path(deployDirectory)));
- jar.setExploded(false);
- } else {
- jar.setDestinationPath(project.getFullPath());
- jar.setInWorkspace(true);
- jar.setExploded(false);
- }
- jar.setName(packageName);
- return jar;
- }
-
-
- public static IArchiveFolder addFolder(IProject project,
- IArchiveNode parent, String name) throws ArchivesModelException {
- IArchiveFolder folder = ArchivesCore.getInstance().getNodeFactory().createFolder();
- folder.setName(name);
- parent.addChild(folder);
- return folder;
- }
- public static IArchiveStandardFileSet addFileset(IProject project, IArchiveNode parent,
- String sourcePath, String includePattern) throws ArchivesModelException {
- IArchiveStandardFileSet fs =
ArchivesCore.getInstance().getNodeFactory().createFileset();
- Assert.isNotNull(project);
- IJavaProject javaProject = JavaCore.create(project);
- Assert.isNotNull(javaProject);
-
- IContainer sourceContainer;
- if( sourcePath != null && !sourcePath.equals("")) { //$NON-NLS-1$
- Path p = new Path(sourcePath);
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- sourceContainer = p.segmentCount() != 1 ? (IContainer)root.getFolder(p) :
root.getProject(p.segment(0));
- } else {
- sourceContainer = project;
- }
-
- fs.setRawSourcePath(sourceContainer.getFullPath().toString());
- fs.setInWorkspace(true);
- fs.setIncludesPattern( includePattern == null ? "**/*" : includePattern );
//$NON-NLS-1$
- parent.addChild(fs);
- return fs;
- }
-
- public abstract String getAssociatedModuleType();
-
- /*
- * Creates a directory scanner for some global path
- */
- public static DirectoryScannerExtension createDirectoryScanner (String rawPath, String
includes, String excludes, boolean scan) {
- return DirectoryScannerFactory.createDirectoryScanner(rawPath, null, includes,
excludes, null, false, 1, scan);
- }
-
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.archivetypes;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
-import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
-import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
-import org.jboss.ide.eclipse.archives.webtools.Messages;
-
-/**
- *
- * @author rob.stryker(a)jboss.com
- */
-public class WarArchiveType extends J2EEArchiveType {
- public static final String WAR_PACKAGE_TYPE =
"org.jboss.ide.eclipse.as.core.packages.warPackage"; //$NON-NLS-1$
-
- public String getAssociatedModuleType() {
- return "jst.web"; //$NON-NLS-1$
- }
-
- public IArchive createDefaultConfiguration(String projectName, IProgressMonitor monitor)
{
- IModule mod = getModule(projectName);
- if( mod == null )
- return createDefaultConfiguration2(projectName, monitor);
- else
- return createDefaultConfigFromModule(mod, monitor);
- }
-
- protected IArchive createDefaultConfiguration2(String projectName, IProgressMonitor
monitor) {
- IProject project = getProject(projectName);
- IArchive topLevel = createGenericIArchive(project, null, project.getName() +
".war"); //$NON-NLS-1$
- return fillDefaultConfiguration(project, topLevel, monitor);
- }
-
- public IArchive fillDefaultConfiguration(String projectName, IArchive topLevel,
IProgressMonitor monitor) {
- return fillDefaultConfiguration(getProject(projectName), topLevel, monitor);
- }
- public IArchive fillDefaultConfiguration(IProject project, IArchive topLevel,
IProgressMonitor monitor) {
- try {
- IModule mod = getModule(project.getName());
- IArchiveFolder webinf = addFolder(project, topLevel, WEBINF);
- IArchiveFolder lib = addFolder(project, webinf, LIB);
- IArchiveFolder classes = addFolder(project, webinf, CLASSES);
- addReferencedProjectsAsLibs(project, lib);
- addLibFileset(project, lib, true);
- addClassesFileset(project, classes);
-
- if( mod == null ) {
- addWebinfFileset(project, webinf);
- } else {
- addWebContentFileset(project, topLevel);
- }
- } catch( ArchivesModelException ame) {}
- return topLevel;
- }
-
- // For modules only
- protected void addWebContentFileset(IProject project, IArchiveNode packageRoot) throws
ArchivesModelException {
- try {
- IPath projectPath = project.getLocation();
- DirectoryScanner scanner = createDirectoryScanner(projectPath.toString(),
"**/WEB-INF/web.xml", null, true); //$NON-NLS-1$
- String[] files = scanner.getIncludedFiles();
- // just take the first
- if( files.length > 0 ) {
- IPath path = new Path(files[0]);
- path = path.removeLastSegments(2); // remove the file name
- path = new Path(project.getName()).append(path); // pre-pend project name to make
workspace-relative
- IArchiveStandardFileSet fs = addFileset(project, packageRoot, path.toOSString(),
"**/*"); //$NON-NLS-1$
- //If we have separate file set for libraries, we do not need to duplicate jars.
- fs.setExcludesPattern("**/WEB-INF/lib/*.jar"); //$NON-NLS-1$
- }
- } catch( IllegalStateException ise ) {
- IStatus status = new Status(IStatus.WARNING, IntegrationPlugin.PLUGIN_ID,
Messages.ExceptionCannotScanDirectory, ise);
- IntegrationPlugin.getDefault().getLog().log(status);
- }
- }
-
- protected void addClassesFileset(IProject project, IArchiveFolder folder) throws
ArchivesModelException {
- IJavaProject jp = JavaCore.create(project);
- if( jp != null ) {
- try {
- IPath outputLoc = project.getWorkspace().getRoot().getLocation();
- outputLoc = outputLoc.append(jp.getOutputLocation());
- addFileset(project, folder, jp.getOutputLocation().toOSString(), "**/*");
//$NON-NLS-1$
- } catch( JavaModelException jme ) {
- // no logging
- }
- }
- }
- protected void addWebinfFileset(IProject project, IArchiveFolder folder) throws
ArchivesModelException {
- try {
- IPath projectPath = project.getLocation();
- DirectoryScanner scanner = createDirectoryScanner(projectPath.toString(),
"**/web.xml", null, true); //$NON-NLS-1$
- String[] files = scanner.getIncludedFiles();
- // just take the first
- if( files.length > 0 ) {
- IPath path = new Path(files[0]);
- path = path.removeLastSegments(1); // remove the file name
- path = new Path(project.getName()).append(path); // pre-pend project name to make
workspace-relative
- addFileset(project, folder, path.toOSString(), "**/*"); //$NON-NLS-1$
- }
- } catch( IllegalStateException ise ) {
- IStatus status = new Status(IStatus.WARNING, ArchivesCorePlugin.PLUGIN_ID,
Messages.ExceptionCannotScanDirectory, ise);
- ArchivesCorePlugin.getDefault().getLog().log(status);
- }
- }
-
- // Lib support
- protected void addLibFileset(IProject project, IArchiveFolder folder, boolean
includeTopLevelJars) throws ArchivesModelException {
- // Let us find /WEB-INF/lib directory and set it as source for the file set.
- String sourcePath = null;
-
- IPath projectPath = project.getLocation();
- DirectoryScanner scanner = createDirectoryScanner(projectPath.toString(),
"**/WEB-INF/web.xml", null, true); //$NON-NLS-1$
- String[] files = scanner.getIncludedFiles();
-
- if(files != null && files.length > 0) {
- IPath path = new Path(files[0]);
- path = path.removeLastSegments(1).append("lib"); //$NON-NLS-1$
- sourcePath = project.getFullPath().append(path).toString();
- addFileset(project, folder, sourcePath, "*.jar"); // add default jars
//$NON-NLS-1$
- } else {
- //having failed to find 'lib' directory, let us make source of the project
itself
- sourcePath = project.getName();
- DirectoryScanner scanner2 = createDirectoryScanner(projectPath.toString(),
"**/*.jar", null, true); //$NON-NLS-1$
- String[] files2 = scanner2.getIncludedFiles();
- IPath p;
- ArrayList list = new ArrayList();
- for( int i = 0; i < files2.length; i++ ) {
- p = project.getFullPath().append(files2[i]).removeLastSegments(1);
- if( !list.contains(p)) {
- list.add(p);
- addFileset(project, folder, p.toString(), "*.jar"); // add default jars
//$NON-NLS-1$
- }
- }
- }
- }
- protected void addReferencedProjectsAsLibs(IProject project, IArchiveFolder folder)
throws ArchivesModelException {
- IJavaProject jp = JavaCore.create(project);
- if( jp != null && jp.exists()) {
- try {
- IClasspathEntry[] entries = jp.getRawClasspath();
- for( int i = 0; i < entries.length; i++ ) {
- if( entries[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IPath path = entries[i].getPath();
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
- if( res instanceof IProject ) {
- createLibFromProject((IProject)res, folder);
- }
- }
- }
- } catch( JavaModelException jme ) {
- // no logging
- }
- }
- }
-
-
- protected void createLibFromProject(IProject project, IArchiveFolder folder) throws
ArchivesModelException {
- IArchive pack = createGenericIArchive(project, null, project.getName() +
".jar");//$NON-NLS-1$
- folder.addChild(pack);
- }
-
- protected IArchive createDefaultConfigFromModule(IModule mod, IProgressMonitor monitor)
{
- try {
- IProject project = mod.getProject();
-
- // create the stub
- IArchive topLevel = createGenericIArchive(project, null, project.getName() +
".war");//$NON-NLS-1$
- topLevel.setDestinationPath(new Path(project.getName()));
- topLevel.setInWorkspace(true);
-
- // add lib folder so we can add libraries
- IArchiveFolder webinf = addFolder(project, topLevel, WEBINF);
- IArchiveFolder lib = addFolder(project, webinf, LIB);
- IArchiveFolder classes = addFolder(project, webinf, CLASSES);
-
-
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IPath webContentPath = vc.getRootFolder().getUnderlyingFolder().getFullPath();
- addFileset(project, topLevel, webContentPath.toOSString(),
"**/*");//$NON-NLS-1$
- addClassesFileset(project, classes);
-
- // package each child and add to lib folder
- IWebModule webModule = (IWebModule)mod.loadAdapter(IWebModule.class, monitor);
- IModule[] childModules = webModule.getModules();
- for (int i = 0; i < childModules.length; i++) {
- IModule child = childModules[i];
- IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new
NullProgressMonitor());
- if( j2eeChild != null && !j2eeChild.isBinary()) {
- lib.addChild(createGenericIArchive(child.getProject(), null,
child.getProject().getName() + ".jar"));//$NON-NLS-1$
- }
- }
- return topLevel;
- } catch( Exception e ) {
- IntegrationPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
IntegrationPlugin.PLUGIN_ID, Messages.ExceptionUnexpectedException, e));
- }
- return null;
- }
-
- public String getId() {
- return WAR_PACKAGE_TYPE;
- }
-
- public String getLabel() {
- return "WAR";//$NON-NLS-1$
- }
-}
\ No newline at end of file
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ModulePackageTypeConverter.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ModulePackageTypeConverter.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ModulePackageTypeConverter.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.modules;
-
-import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.EjbArchiveType;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
-
-/**
- *
- * @author rob.stryker(a)jboss.com
- */
-public class ModulePackageTypeConverter {
- public static IArchiveType getPackageTypeFor(IModule module) {
- String modType = module.getModuleType().getId();
- if("jst.web".equals(modType)) {//$NON-NLS-1$
- return
ArchivesCore.getInstance().getExtensionManager().getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE);
- } else if("jst.ear".equals(modType)) {//$NON-NLS-1$
- return
ArchivesCore.getInstance().getExtensionManager().getArchiveType(EarArchiveType.ID);
- } else if("jst.ejb".equals(modType)) {//$NON-NLS-1$
- return
ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID);
- }
-
- return null;
- }
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.ui;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
-import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
-import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
-import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
-
-public class NewEARAction implements IActionDelegate {
-
- private IStructuredSelection selection;
- public void run() {
- AbstractArchiveWizard wizard = new NewEARWizard();
- wizard.init(PlatformUI.getWorkbench(), selection);
- WizardDialog dialog = new
WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
- dialog.open();
- }
-
-
- public void run(IAction action) {
- run();
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if( selection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection)selection;
- }
-
- public void init(IViewPart view) {
- }
-
- public static class NewEARWizard extends AbstractArchiveWizard {
-
- private EARPreviewPage earInfoPage;
-
- public NewEARWizard () {
- setWindowTitle(Messages.NewEar);
- }
-
- public ImageDescriptor getImageDescriptor() {
- return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR);
- }
-
- public WizardPage[] createWizardPages() {
- earInfoPage = new EARPreviewPage(this);
-
- return new WizardPage[] { earInfoPage };
- }
-
- public boolean performFinish(IArchive pkg) {
- pkg.setArchiveType(ArchivesCore.getInstance().getExtensionManager().getArchiveType(EarArchiveType.ID));
- return true;
- }
-
- public String getArchiveExtension() {
- return "ear"; //$NON-NLS-1$
- }
- }
-
-
- protected static class EARPreviewPage extends PreviewPage {
- protected EARPreviewPage(NewEARWizard wiz) {
- super(wiz, Messages.EarPreview, Messages.EarPreview,
- ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR));
- }
- protected String getArchiveTypeId() {
- return EarArchiveType.ID;
- }
- protected String getDescriptionMessage() {
- return Messages.EarDescription;
- }
- }
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.ui;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
-import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
-import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
-import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.EjbArchiveType;
-
-public class NewEJBJARAction implements IActionDelegate {
- private IStructuredSelection selection;
- public void run() {
- AbstractArchiveWizard wizard = new NewEJBWizard();
- wizard.init(PlatformUI.getWorkbench(), selection);
- WizardDialog dialog = new
WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
- dialog.open();
- }
-
- public void run(IAction action) {
- run();
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if( selection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection)selection;
- }
-
- public static class NewEJBWizard extends AbstractArchiveWizard {
-
- private EjbJarPreviewPage ejbInfoPage;
-
- public NewEJBWizard () {
- setWindowTitle(Messages.NewEjbJar);
- }
-
- public ImageDescriptor getImageDescriptor() {
- return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EJB_JAR);
- }
-
- public WizardPage[] createWizardPages() {
- ejbInfoPage = new EjbJarPreviewPage(this);
-
- return new WizardPage[] { ejbInfoPage };
- }
-
- public boolean performFinish(IArchive pkg) {
- pkg.setArchiveType(ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID));
- return true;
- }
-
- public String getArchiveExtension() {
- return "jar"; //$NON-NLS-1$
- }
- }
-
-
- protected static class EjbJarPreviewPage extends PreviewPage {
- protected EjbJarPreviewPage(NewEJBWizard wiz) {
- super(wiz, Messages.EjbJarPreview, Messages.EjbJarPreview,
- ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_JAR_WIZARD));
- }
- protected String getArchiveTypeId() {
- return EjbArchiveType.ID;
- }
- protected String getDescriptionMessage() {
- return Messages.EjbJarDescription;
- }
- }
-
-}
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.webtools.ui;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
-import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
-import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
-import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
-
-public class NewWARAction implements IActionDelegate {
- private IStructuredSelection selection;
- public void run() {
- NewWARWizard wizard = new NewWARWizard();
- wizard.init(PlatformUI.getWorkbench(), selection);
- WizardDialog dialog = new
WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
- dialog.open();
- }
-
- public void run(IAction action) {
- run();
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if( selection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection)selection;
- }
-
-
- public static class NewWARWizard extends AbstractArchiveWizard {
-
- private WarPreviewPage warInfoPage;
-
- public NewWARWizard () {
- setWindowTitle(Messages.NewWar);
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public WizardPage[] createWizardPages() {
- warInfoPage = new WarPreviewPage(this);
-
- return new WizardPage[] { warInfoPage };
- }
-
- public boolean performFinish(IArchive pkg) {
- pkg.setArchiveType(ArchivesCore.getInstance().getExtensionManager().getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE));
- return true;
- }
-
- public String getArchiveExtension() {
- return "war"; //$NON-NLS-1$
- }
- }
-
- protected static class WarPreviewPage extends PreviewPage {
- protected WarPreviewPage(NewWARWizard wiz) {
- super(wiz, Messages.WarPreview, Messages.WarPreview,
- ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_WAR_WIZARD));
- }
-
- protected String getArchiveTypeId() {
- return WarArchiveType.WAR_PACKAGE_TYPE;
- }
-
- protected String getDescriptionMessage() {
- return Messages.WarDescription;
- }
- }
-}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2012-02-23
06:58:25 UTC (rev 39028)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2012-02-23
07:20:01 UTC (rev 39029)
@@ -51,7 +51,6 @@
import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification;
import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType;
public abstract class PreviewPage extends WizardPageWithNotification {