You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2010/05/11 01:11:57 UTC
svn commit: r942946 - in /geronimo/devtools/eclipse-plugin/trunk: eclipse/
plugins/org.apache.geronimo.st.v21.core/
plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/
Author: mcconne
Date: Mon May 10 23:11:57 2010
New Revision: 942946
URL: http://svn.apache.org/viewvc?rev=942946&view=rev
Log:
GERONIMODEVTOOLS-640 Update to Helios M7
Modified:
geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=942946&r1=942945&r2=942946&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Mon May 10 23:11:57 2010
@@ -31,19 +31,19 @@
<target name="init">
- <property name="helios_url" value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/M6"/>
- <property name="helios_jee_win32" value="eclipse-jee-helios-M6-win32.zip"/>
- <property name="helios_jee_win64" value="eclipse-jee-helios-M6-win32_64.zip"/>
- <property name="helios_jee_linux" value="eclipse-jee-helios-M6-linux-gtk.tar"/>
- <property name="helios_jee_linux-x86_64" value="eclipse-jee-helios-M6-linux-gtk-x86_64.tar"/>
- <property name="helios_jee_macos" value="eclipse-jee-helios-M6-macosx-carbon.tar"/>
+ <property name="helios_url" value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/M7"/>
+ <property name="helios_jee_win32" value="eclipse-jee-helios-M7-win32.zip"/>
+ <property name="helios_jee_win64" value="eclipse-jee-helios-M7-win32_64.zip"/>
+ <property name="helios_jee_linux" value="eclipse-jee-helios-M7-linux-gtk.tar"/>
+ <property name="helios_jee_linux-x86_64" value="eclipse-jee-helios-M7-linux-gtk-x86_64.tar"/>
+ <property name="helios_jee_macos" value="eclipse-jee-helios-M7-macosx-carbon.tar"/>
<property name="helios_jee_linux_gz" value="${helios_jee_linux}.gz"/>
<property name="helios_jee_linux-x86_64_gz" value="${helios_jee_linux-x86_64}.gz"/>
<property name="helios_jee_macos_gz" value="${helios_jee_macos}.gz"/>
- <property name="tptp-version" value="4.7.0M6"/>
+ <property name="tptp-version" value="4.7.0M7"/>
<property name="tptp" value="tptp.runtime-TPTP-${tptp-version}.zip"/>
- <property name="tptp-runtime-url" value="http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0M6-201003152345"/>
+ <property name="tptp-runtime-url" value="http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0M7-201005041505"/>
<property name="protocol" value="&r=1&protocol=http"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath?rev=942946&r1=942945&r2=942946&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath Mon May 10 23:11:57 2010
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java?rev=942946&r1=942945&r2=942946&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java Mon May 10 23:11:57 2010
@@ -61,9 +61,12 @@ public class DeploymentUtils {
public static final IPath STATE_LOC = Activator.getDefault().getStateLocation();
private DeploymentUtils() {
+ Trace.tracePoint("Entry/Exit", "DeploymentUtils.DeploymentUtils");
}
+
public static IPath generateExplodedConfiguration(IModule module, IPath outputPath) {
+ Trace.tracePoint("Entry", "DeploymentUtils.generateExplodedConfiguration", module, outputPath);
IPath output = outputPath.append(module.getName() + getModuleExtension(module));
try {
@@ -95,32 +98,53 @@ public class DeploymentUtils {
e.printStackTrace();
}
+ Trace.tracePoint("Exit ", "DeploymentUtils.generateExplodedConfiguration", output);
return output;
}
+
public static IModuleResource[] getModuleResources(IModule module) throws CoreException {
+ Trace.tracePoint("Entry", "DeploymentUtils.getModuleResources", module);
+
ProjectModule pm = (ProjectModule)module.loadAdapter(ProjectModule.class, null);
if (pm != null) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleResources", pm.members());
return pm.members();
}
+
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleResources", null);
return null;
}
+
private static String getModuleExtension(IModule module) {
- if(GeronimoUtils.isEarModule(module)) {
+ Trace.tracePoint("Entry", "DeploymentUtils.getModuleExtension", module);
+
+ if (GeronimoUtils.isEarModule(module)) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".ear");
return ".ear";
- }else if(GeronimoUtils.isWebModule(module)) {
+ }
+ else if (GeronimoUtils.isWebModule(module)) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".war");
return ".war";
- }else if(GeronimoUtils.isRARModule(module)) {
+ }
+ else if (GeronimoUtils.isRARModule(module)) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".rar");
return ".rar";
- }else if(GeronimoUtils.isAppClientModule(module)) {
+ }
+ else if (GeronimoUtils.isAppClientModule(module)) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".car");
return ".car";
}
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".jar");
return ".jar";
}
+
public static File createJarFile(IModule module, IPath outputPath) {
+ Trace.tracePoint("Entry", "DeploymentUtils.createJarFile", module, outputPath);
+
IDataModel model = getExportDataModel(module);
if (model != null) {
@@ -141,6 +165,7 @@ public class DeploymentUtils {
if (model != null) {
try {
model.getDefaultOperation().execute(null, null);
+ Trace.tracePoint("Entry", "DeploymentUtils.createJarFile",new File(model.getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION)));
return new File(model.getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION));
} catch (ExecutionException e) {
e.printStackTrace();
@@ -148,10 +173,14 @@ public class DeploymentUtils {
}
}
+ Trace.tracePoint("Entry", "DeploymentUtils.createJarFile", null);
return null;
}
+
public static IDataModel getExportDataModel(IModule module) {
+ Trace.tracePoint("Entry", "DeploymentUtils.getExportDataModel", module);
+
String type = module.getModuleType().getId();
if (IModuleConstants.JST_WEB_MODULE.equals(type)) {
return DataModelFactory.createDataModel(new WebComponentExportDataModelProvider());
@@ -164,24 +193,36 @@ public class DeploymentUtils {
} else if (IModuleConstants.JST_APPCLIENT_MODULE.equals(type)) {
return DataModelFactory.createDataModel(new AppClientComponentExportDataModelProvider());
}
+
+ Trace.tracePoint("Exit ", "DeploymentUtils.getExportDataModel", null);
return null;
}
+
public static TargetModuleID getTargetModuleID(IServer server, IModule module) throws TargetModuleIdNotFoundException {
+ Trace.tracePoint("Entry", "DeploymentUtils.getTargetModuleID", module);
+
String configId = ModuleArtifactMapper.getInstance().resolve(server, module);
if(configId == null) {
throw new TargetModuleIdNotFoundException("Could not do a local TargetModuleID lookup for module " + module.getName());
}
IGeronimoServer gs = (IGeronimoServer) server.getAdapter(IGeronimoServer.class);
+
+ Trace.tracePoint("Exit ", "DeploymentUtils.generateExplodedConfiguration",gs.getVersionHandler().createTargetModuleId(configId));
return gs.getVersionHandler().createTargetModuleId(configId);
}
+
public static TargetModuleID getTargetModuleID(DeploymentManager dm, String configId) throws TargetModuleIdNotFoundException {
+ Trace.tracePoint("Entry", "DeploymentUtils.getTargetModuleID", dm, configId);
try {
TargetModuleID id = isInstalledModule(dm,configId);
- if (id!=null) return id;
+ if (id!=null) {
+ Trace.tracePoint("Entry", "DeploymentUtils.getTargetModuleID", id);
+ return id;
+ }
} catch (IllegalStateException e) {
e.printStackTrace();
} catch (TargetException e) {
@@ -193,6 +234,7 @@ public class DeploymentUtils {
throw new TargetModuleIdNotFoundException("Could not find TargetModuleID with configId " + configId);
}
+
/**
* This method determines the last known config id for an IModule that has been deployed to the server. The
* configId from the plan cannot be used as the project may have been previously deployed with a different
@@ -204,6 +246,7 @@ public class DeploymentUtils {
* @throws Exception
*/
public static String getLastKnownConfigurationId(IModule module, IServer server) throws Exception {
+ Trace.tracePoint("Entry", "DeploymentUtils.getLastKnownConfigurationId", module, server);
IGeronimoServer gs = (IGeronimoServer) server.getAdapter(IGeronimoServer.class);
String currentId = gs.getVersionHandler().getConfigID(module);
@@ -216,6 +259,7 @@ public class DeploymentUtils {
try {
getTargetModuleID(dm, query);
+ Trace.tracePoint("Exit ", "DeploymentUtils.getLastKnownConfigurationId", query);
return query;
} catch (TargetModuleIdNotFoundException e) {
Trace.trace(Trace.INFO, e.getMessage());
@@ -224,18 +268,25 @@ public class DeploymentUtils {
if(query != currentId) {
try {
getTargetModuleID(dm, currentId);
+ Trace.tracePoint("Exit ", "DeploymentUtils.getLastKnownConfigurationId", currentId);
return currentId;
} catch (TargetModuleIdNotFoundException e) {
Trace.trace(Trace.INFO, e.getMessage());
}
}
+ Trace.tracePoint("Exit ", "DeploymentUtils.getLastKnownConfigurationId", null);
return null;
}
public static List<IModuleResourceDelta> getAffectedJSPFiles(IModuleResourceDelta delta) {
- if (delta == null) return null;
+ Trace.tracePoint("Entry", "DeploymentUtils.getAffectedJSPFiles", delta);
+
+ if (delta == null) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", null);
+ return null;
+ }
IModuleResource resource = delta.getModuleResource();
List<IModuleResourceDelta> fileList = new ArrayList<IModuleResourceDelta>();
@@ -245,27 +296,43 @@ public class DeploymentUtils {
if (moduleFile.getName().endsWith(".jsp")) {
fileList.add(delta);
}
- else return null; //not only jsp changed
+ else {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", null);
+ return null; //not only jsp changed
+ }
}
else if (resource instanceof IModuleFolder) {
- IModuleResourceDelta[] deltaArray = delta.getAffectedChildren();
- for (IModuleResourceDelta childDelta : deltaArray) {
+ IModuleResourceDelta[] deltaArray = delta.getAffectedChildren();
+ for (IModuleResourceDelta childDelta : deltaArray) {
List<IModuleResourceDelta> deltaChildren = getAffectedJSPFiles(childDelta);
if (deltaChildren != null) fileList.addAll(deltaChildren);
- else return null;
+ else {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", null);
+ return null;
+ }
}
}
+ Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", fileList);
return fileList;
}
+
public static boolean isInstalledModule(IServer server, String configId) {
+ Trace.tracePoint("Entry", "DeploymentUtils.isInstalledModule", server, configId);
+
DeploymentManager dm;
try {
dm = DeploymentCommandFactory.getDeploymentManager(server);
TargetModuleID id=isInstalledModule(dm,configId);
- if (id==null) return false;
- else return true;
+ if (id==null) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", false);
+ return false;
+ }
+ else {
+ Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", true);
+ return true;
+ }
} catch (CoreException e) {
e.printStackTrace();
return false;
@@ -279,18 +346,26 @@ public class DeploymentUtils {
}
+
private static TargetModuleID isInstalledModule(DeploymentManager dm, String configId) throws CoreException, IllegalStateException, TargetException{
+ Trace.tracePoint("Entry", "DeploymentUtils.isInstalledModule", dm, configId);
TargetModuleID[] ids = dm.getAvailableModules(null, dm.getTargets());
- if(ids == null) return null;
+ if(ids == null) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", null);
+ return null;
+ }
if (ids != null) {
for (int i = 0; i < ids.length; i++) {
if (ids[i].getModuleID().equals(configId)) {
Trace.trace(Trace.INFO, "Found configuration " + configId + " on server.");
+ Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", ids[i]);
return ids[i];
}
}
}
+
+ Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", null);
return null;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java?rev=942946&r1=942945&r2=942946&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java Mon May 10 23:11:57 2010
@@ -85,6 +85,7 @@ abstract public class GeronimoServerDele
public abstract String getContextRoot(IModule module) throws Exception ;
+
/*
* (non-Javadoc)
*
@@ -92,20 +93,26 @@ abstract public class GeronimoServerDele
* org.eclipse.wst.server.core.IModule[])
*/
public IStatus canModifyModules(IModule[] add, IModule[] remove) {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.canModifyModules", add, remove);
+
if (add != null) {
for (int i = 0; i < add.length; i++) {
IModule module = add[i];
if (module.getProject() != null) {
IStatus status = FacetUtil.verifyFacets(module.getProject(), getServer());
if (status != null && !status.isOK()) {
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.canModifyModules", status);
return status;
}
}
}
}
+
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.canModifyModules", Status.OK_STATUS);
return Status.OK_STATUS;
}
+
/*
* (non-Javadoc)
*
@@ -114,26 +121,40 @@ abstract public class GeronimoServerDele
* org.eclipse.core.runtime.IProgressMonitor)
*/
public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.modifyModules", add, remove, monitor);
+
// TODO servermodule.info should be pushed to here and set as instance
// property
+
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.modifyModules");
}
+
/*
* (non-Javadoc)
*
* @see org.eclipse.wst.server.core.model.ServerDelegate#getRootModules(org.eclipse.wst.server.core.IModule)
*/
public IModule[] getRootModules(IModule module) throws CoreException {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.getRootModules", module);
+
IStatus status = canModifyModules(new IModule[] { module }, null);
if (status != null && !status.isOK())
throw new CoreException(status);
IModule[] childs = doGetParentModules(module);
- if (childs.length > 0)
+ if (childs.length > 0) {
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", childs);
return childs;
+ }
+
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", new IModule[] { module });
return new IModule[] { module };
}
+
private IModule[] doGetParentModules(IModule module) {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.doGetParentModules", module);
+
ArrayList<IModule> parents = new ArrayList<IModule>();
parents.addAll(getApplicationModules(module));
@@ -145,10 +166,15 @@ abstract public class GeronimoServerDele
parents.add(wars[i]);
}
}
+
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.doGetParentModules", (IModule[]) parents.toArray(new IModule[parents.size()]));
return (IModule[]) parents.toArray(new IModule[parents.size()]);
}
+
private List<IModule> getApplicationModules(IModule module) {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.getApplicationModules", module);
+
IModule[] ears = ServerUtil.getModules(IModuleConstants.JST_EAR_MODULE);
ArrayList<IModule> list = new ArrayList<IModule>();
for (int i = 0; i < ears.length; i++) {
@@ -159,17 +185,24 @@ abstract public class GeronimoServerDele
list.add(ears[i]);
}
}
+
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getApplicationModules", list);
return list;
}
+
/*
* (non-Javadoc)
*
* @see org.eclipse.wst.server.core.model.ServerDelegate#getChildModules(org.eclipse.wst.server.core.IModule[])
*/
public IModule[] getChildModules(IModule[] module) {
- if (module == null)
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.getChildModules", module);
+
+ if (module == null) {
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", null);
return null;
+ }
if (module.length == 1 && module[0] != null) {
IModuleType moduleType = module[0].getModuleType();
@@ -178,41 +211,54 @@ abstract public class GeronimoServerDele
IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0].loadAdapter(IEnterpriseApplication.class, null);
if (enterpriseApplication != null) {
IModule[] modules = enterpriseApplication.getModules();
- if (modules != null)
+ if (modules != null) {
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", modules);
return modules;
+ }
}
} else if (IModuleConstants.JST_WEB_MODULE.equals(moduleType.getId())) {
IWebModule webModule = (IWebModule) module[0].loadAdapter(IWebModule.class, null);
if (webModule != null) {
IModule[] modules = webModule.getModules();
- if (modules != null)
+ if (modules != null) {
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", modules);
return modules;
+ }
}
}
}
}
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", new IModule[] {});
return new IModule[] {};
}
+
/*
* (non-Javadoc)
*
* @see org.eclipse.wst.server.core.model.ServerDelegate#getServerPorts()
*/
public ServerPort[] getServerPorts() {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.getServerPorts");
+
List<ServerPort> ports = new ArrayList<ServerPort>();
ports.add(new ServerPort(PROPERTY_HTTP_PORT, "Web Connector", Integer.parseInt(getHTTPPort()), "http"));
ports.add(new ServerPort(PROPERTY_RMI_PORT, "RMI Naming", Integer.parseInt(getRMINamingPort()), "rmi"));
+
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.getServerPorts;", (ServerPort[]) ports.toArray(new ServerPort[ports.size()]));
return (ServerPort[]) ports.toArray(new ServerPort[ports.size()]);
}
+
/*
* (non-Javadoc)
*
* @see org.eclipse.wst.server.core.model.IURLProvider#getModuleRootURL(org.eclipse.wst.server.core.IModule)
*/
public URL getModuleRootURL(IModule module) {
+ Trace.tracePoint("Entry", "GeronimoServerDelegate.getModuleRootURL", module);
+
try {
if (module == null
|| module.loadAdapter(IWebModule.class, null) == null)
@@ -235,6 +281,7 @@ abstract public class GeronimoServerDele
if (!url.endsWith("/"))
url += "/";
+ Trace.tracePoint("Exit ", "GeronimoServerDelegate.getModuleRootURL", new URL(url));
return new URL(url);
} catch (Exception e) {
Trace.trace(Trace.SEVERE, "Could not get root URL", e);
@@ -243,6 +290,7 @@ abstract public class GeronimoServerDele
}
+
public String getAdminID() {
return getInstanceProperty(PROPERTY_ADMIN_ID);
}
@@ -424,5 +472,4 @@ abstract public class GeronimoServerDele
setAttribute(GeronimoRuntimeDelegate.SERVER_INSTANCE_PROPERTIES, map);
}
-
}