geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r280955 - in /geronimo/devtools/trunk/modules/eclipse-plugin: etc/ plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ plugins/org.apache.geronimo.runtime.v1/ plugins/org.apache.geronimo.ui/META-INF/
Date Wed, 14 Sep 2005 22:07:42 GMT
Author: sppatel
Date: Wed Sep 14 15:07:38 2005
New Revision: 280955

URL: http://svn.apache.org/viewcvs?rev=280955&view=rev
Log:
Fix compile errors due to API and dependency changes in latest WTP I-driver.

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ExportDeploymentPlanDataModelProvider.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/.classpath
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/META-INF/MANIFEST.MF

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties?rev=280955&r1=280954&r2=280955&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Wed Sep 14 15:07:38
2005
@@ -23,12 +23,13 @@
 maven.jar.org.eclipse.emf.common = ${eclipse.home.plugins}/org.eclipse.emf.common_2.1.0.jar
 maven.jar.org.eclipse.core.commands = ${eclipse.home.plugins}/org.eclipse.core.commands_3.1.0.jar

 #Dependencies that will be made as a packaged jar
-maven.jar.org.eclipse.jst.j2ee.web = ${eclipse.home.plugins}/org.eclipse.jst.j2ee.web_0.7.0/runtime/web.jar
-maven.jar.org.eclipse.jst.j2ee.ejb = ${eclipse.home.plugins}/org.eclipse.jst.j2ee.ejb_0.7.0/runtime/ejb.jar
+maven.jar.org.eclipse.jst.j2ee.web = ${eclipse.home.plugins}/org.eclipse.jst.j2ee.web_0.7.0.jar
+maven.jar.org.eclipse.jst.j2ee.ejb = ${eclipse.home.plugins}/org.eclipse.jst.j2ee.ejb_0.7.0.jar
+maven.jar.org.eclipse.jst.j2ee = ${eclipse.home.plugins}/org.eclipse.jst.j2ee_0.7.0.jar
+maven.jar.org.eclipse.wst.common.modulecore = ${eclipse.home.plugins}/org.eclipse.wst.common.modulecore_0.7.0.jar
+
 maven.jar.org.eclipse.jst.server.generic.core = ${eclipse.home.plugins}/org.eclipse.jst.server.generic.core_0.7.0/genericserver.jar
-maven.jar.org.eclipse.wst.common.modulecore = ${eclipse.home.plugins}/org.eclipse.wst.common.modulecore_0.7.0/modulecore.jar
 maven.jar.org.eclipse.jem.util = ${eclipse.home.plugins}/org.eclipse.jem.util_1.1.0/util.jar
-maven.jar.org.eclipse.jst.j2ee = ${eclipse.home.plugins}/org.eclipse.jst.j2ee_0.7.0/runtime/j2eeplugin.jar
 #Dependencies that may not be made as a packaged jar
 maven.jar.org.eclipse.jst.j2ee.core.commonArchive = ${eclipse.home.plugins}/org.eclipse.jst.j2ee.core_0.7.0/runtime/commonArchive.jar
 maven.jar.org.eclipse.jst.j2ee.core.j2eeCorePlugin = ${eclipse.home.plugins}/org.eclipse.jst.j2ee.core_0.7.0/runtime/j2eeCorePlugin.jar

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ExportDeploymentPlanDataModelProvider.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/operations/ExportDeploymentPlanDataModelProvider.java?rev=280955&r1=280954&r2=280955&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ExportDeploymentPlanDataModelProvider.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ExportDeploymentPlanDataModelProvider.java
Wed Sep 14 15:07:38 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.geronimo.core.operations;
 
+import java.util.Set;
+
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
 
 /**
@@ -31,14 +33,15 @@
     public ExportDeploymentPlanDataModelProvider() {
         super();
     }
-
-    /*
-     * (non-Javadoc)
-     * 
+    
+    /* (non-Javadoc)
      * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
      */
-    public String[] getPropertyNames() {
-        return new String[]{IExportDeploymentPlanDataModelProperties.COMPONENT_NAME, IExportDeploymentPlanDataModelProperties.PROJECT_NAME};
+    public Set getPropertyNames() {
+        Set propertyNames = super.getPropertyNames();
+        propertyNames.add(IExportDeploymentPlanDataModelProperties.COMPONENT_NAME);
+        propertyNames.add(IExportDeploymentPlanDataModelProperties.PROJECT_NAME);
+        return propertyNames;
     }
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/.classpath
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/.classpath?rev=280955&r1=280954&r2=280955&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/.classpath
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/.classpath
Wed Sep 14 15:07:38 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-1.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-1.0-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-1.0-M4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-1.0-M4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-spec-j2ee-deployment-1.1-rc4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mx4j-3.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mx4j-remote-3.0.1.jar"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/META-INF/MANIFEST.MF?rev=280955&r1=280954&r2=280955&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/META-INF/MANIFEST.MF
Wed Sep 14 15:07:38 2005
@@ -11,7 +11,6 @@
  org.eclipse.ui,
  org.eclipse.ui.forms,
  org.eclipse.ui.ide,
- org.apache.geronimo.core,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -26,5 +25,5 @@
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.browser,
  org.eclipse.wst.server.ui,
-  org.eclipse.jst.server.generic.core
+ org.eclipse.jst.server.generic.core
 Eclipse-AutoStart: true



Mime
View raw message