[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages ...
Robert Stryker
rob.stryker at jboss.com
Sat Mar 3 00:25:04 EST 2007
User: rawb
Date: 07/03/03 00:25:04
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages
WarPackageType.java EarPackageType.java
ObscurelyNamedPackageTypeSuperclass.java
Log:
recent changes for integration w./ packaging
Revision Changes Path
1.5 +6 -11 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/WarPackageType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WarPackageType.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/WarPackageType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WarPackageType.java 2 Mar 2007 21:37:03 -0000 1.4
+++ WarPackageType.java 3 Mar 2007 05:25:04 -0000 1.5
@@ -82,7 +82,7 @@
try {
IPath outputLoc = project.getWorkspace().getRoot().getLocation();
outputLoc = outputLoc.append(jp.getOutputLocation());
- addFileset(project, folder, jp.getOutputLocation().removeFirstSegments(1).toOSString(), "**/*.class");
+ addFileset(project, folder, jp.getOutputLocation().toOSString(), "**/*.class");
} catch( JavaModelException jme ) {
}
}
@@ -95,16 +95,15 @@
// just take the first
if( files.length > 0 ) {
IPath path = new Path(files[0]);
- path = path.removeLastSegments(1);
- path.removeFirstSegments(projectPath.segmentCount());
+ path = path.removeLastSegments(1); // remove the file name
+ path.removeFirstSegments(projectPath.segmentCount()-1); // leave project name
addFileset(project, folder, path.toOSString(), "**/*");
}
}
protected void addLibFileset(IProject project, IPackageFolder folder) {
- addFileset(project, folder, "", "**/*.jar"); // add default jars
+ addFileset(project, folder, project.getName(), "**/*.jar"); // add default jars
// now add referenced projects
- ArrayList list = new ArrayList();
IJavaProject jp = JavaCore.create(project);
if( jp != null ) {
try {
@@ -127,13 +126,8 @@
protected void createLibFromProject(IProject project, IPackageFolder folder) {
IPackage pack = createGenericIPackage(project, null, project.getName() + ".jar");
folder.addChild(pack);
- System.out.println("creating library from " + project);
}
-
-
-
-
protected IPackage createDefaultConfigFromModule(IModule mod, IProgressMonitor monitor) {
try {
IProject project = mod.getProject();
@@ -143,7 +137,8 @@
IPackageFolder webinf = addFolder(project, topLevel, WEBINF);
IPackageFolder metainf = addFolder(project, topLevel, METAINF);
IPackageFolder lib = addFolder(project, metainf, LIB);
- addFileset(project, webinf, WEBCONTENT + Path.SEPARATOR + WEBINF, null);
+ addFileset(project, webinf,
+ new Path(project.getName()).append(WEBCONTENT).append(WEBINF).toOSString(), null);
IWebModule webModule = (IWebModule)mod.loadAdapter(IWebModule.class, monitor);
IModule[] childModules = webModule.getModules();
1.4 +3 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/EarPackageType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EarPackageType.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/EarPackageType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EarPackageType.java 8 Feb 2007 00:12:21 -0000 1.3
+++ EarPackageType.java 3 Mar 2007 05:25:04 -0000 1.4
@@ -25,6 +25,7 @@
import org.eclipse.core.resources.IProject;
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.wst.server.core.IModule;
import org.jboss.ide.eclipse.packages.core.model.IPackage;
@@ -56,7 +57,7 @@
topLevel.setDestinationContainer(project);
IPackageFolder metainf = addFolder(project, topLevel, METAINF);
IPackageFolder lib = addFolder(project, metainf, LIB);
- addFileset(project, metainf, METAINF, null);
+ addFileset(project, metainf, new Path(project.getName()).append(METAINF).toOSString(), null);
return topLevel;
}
@@ -66,7 +67,7 @@
IContainer sourceContainer = project.getFolder(EARCONTENT);
IPackage topLevel = createGenericIPackage(project, null, project.getName() + ".ear", sourceContainer);
- addFileset(project, topLevel, EARCONTENT, "**/*.*");
+ addFileset(project, topLevel, new Path(project.getName()).append(EARCONTENT).toOSString(), "**/*.*");
// now add children
IEnterpriseApplication earModule = (IEnterpriseApplication)module.loadAdapter(IEnterpriseApplication.class, monitor);
1.5 +14 -10 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ObscurelyNamedPackageTypeSuperclass.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ObscurelyNamedPackageTypeSuperclass.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ObscurelyNamedPackageTypeSuperclass.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ObscurelyNamedPackageTypeSuperclass.java 2 Mar 2007 21:37:03 -0000 1.4
+++ ObscurelyNamedPackageTypeSuperclass.java 3 Mar 2007 05:25:04 -0000 1.5
@@ -23,6 +23,8 @@
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.Path;
@@ -45,13 +47,13 @@
* @author rob.stryker at jboss.com
*/
public abstract class ObscurelyNamedPackageTypeSuperclass extends AbstractPackageType {
- protected static final String METAINF = "META-INF";
- protected static final String WEBINF = "WEB-INF";
- protected static final String CLASSES = "classes";
- protected static final String LIB = "lib";
- protected static final String WEBCONTENT = "WebContent";
- protected static final String EARCONTENT = "EarContent";
- protected static final String EJBMODULE = "ejbModule";
+ public static final String METAINF = "META-INF";
+ public static final String WEBINF = "WEB-INF";
+ public static final String CLASSES = "classes";
+ public static final String LIB = "lib";
+ public static final String WEBCONTENT = "WebContent";
+ public static final String EARCONTENT = "EarContent";
+ public static final String EJBMODULE = "ejbModule";
protected boolean isModuleType(IModule module, String moduleTypeId){
@@ -112,13 +114,13 @@
}
- protected static IPackageFolder addFolder(IProject project, IPackageNode parent, String name) {
+ public static IPackageFolder addFolder(IProject project, IPackageNode parent, String name) {
IPackageFolder folder = PackagesCore.createPackageFolder(project);
folder.setName(name);
parent.addChild(folder);
return folder;
}
- protected static IPackageFileSet addFileset(IProject project, IPackageNode parent, String sourcePath, String includePattern) {
+ public static IPackageFileSet addFileset(IProject project, IPackageNode parent, String sourcePath, String includePattern) {
IPackageFileSet fs = PackagesCore.createPackageFileSet(project);
Assert.isNotNull(project);
IJavaProject javaProject = JavaCore.create(project);
@@ -126,7 +128,9 @@
IContainer sourceContainer;
if( sourcePath != null && !sourcePath.equals("")) {
- sourceContainer = project.getFolder(new Path(sourcePath));
+ 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;
}
More information about the jboss-cvs-commits
mailing list