geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r357475 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins: org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java org.apache.geronimo.ui/project.xml
Date Sun, 18 Dec 2005 16:19:51 GMT
Author: sppatel
Date: Sun Dec 18 08:19:45 2005
New Revision: 357475

URL: http://svn.apache.org/viewcvs?rev=357475&view=rev
Log:
fix server not starting due to classpath override and NPE on opening editor

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java?rev=357475&r1=357474&r2=357475&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
Sun Dec 18 08:19:45 2005
@@ -296,11 +296,11 @@
 	}
 	
 	public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor
monitor) throws CoreException {
-		String defaultArgs = getServerDefinition().getResolver().resolveProperties(getServerDefinition().getStop().getProgramArgumentsAsString());
-		String existingVMArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,defaultArgs);
+		String defaultArgs = getServerDefinition().getResolver().resolveProperties(getServerDefinition().getStart().getProgramArgumentsAsString());
+		String existingPrgArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,defaultArgs);
         super.setupLaunchConfiguration(workingCopy, monitor);
-		if(existingVMArgs !=null) {
-            workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,existingVMArgs);
+		if(existingPrgArgs !=null) {
+            workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,existingPrgArgs);
         }
 	}
 		

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml?rev=357475&r1=357474&r2=357475&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
Sun Dec 18 08:19:45 2005
@@ -36,10 +36,10 @@
         </includes>
       </resource>
       <resource>
-        <targetPath>icons/obj16/</targetPath>
-        <directory>icons/obj16</directory>
+        <targetPath>icons</targetPath>
+        <directory>icons</directory>
         <includes>
-          <include>*.gif</include>
+          <include>**/*.gif</include>
         </includes>
       </resource>
       <resource>



Mime
View raw message