geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r354821 - in /geronimo/devtools/trunk/modules/eclipse-plugin: geronimo-emf/ plugins/org.apache.geronimo.deployment.model/META-INF/ plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/ plugins/org.apache.g...
Date Wed, 07 Dec 2005 18:08:17 GMT
Author: sppatel
Date: Wed Dec  7 10:08:09 2005
New Revision: 354821

URL: http://svn.apache.org/viewcvs?rev=354821&view=rev
Log:
fix compile errors new to regen

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/build.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/DeploymentPlanCreationOperation.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/WebGeneralSection.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/build.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/build.xml?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/build.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/build.xml Wed Dec  7 10:08:09
2005
@@ -40,7 +40,7 @@
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.1 org.apache.geronimo.xml.ns.security"/>
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
-				<arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/web-1.0 org.apache.geronimo.xml.ns.web"/>

+				<arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/web-1.0 org.apache.geronimo.xml.ns.j2ee.web"/>

 							
 				<arg line="-packages http://geronimo.apache.org/xml/ns/naming-1.0"/>
 				<arg line="-packages http://geronimo.apache.org/xml/ns/security-1.1"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml Wed Dec  7 10:08:09
2005
@@ -92,8 +92,10 @@
       <ant:arg value="org.eclipse.ant.core.antRunner"/>
       <ant:arg value="-buildfile"/>
       <ant:arg value="${basedir}/build.xml"/>
-   </ant:java> 
-   <ant:delete dir="bin"/>
+   </ant:java>
+   <ant:copy file=".classpath" todir="../plugins/org.apache.geronimo.deployment.model/"
overwrite="true"/>
+   <ant:copy file=".classpath" todir="../plugins/org.apache.geronimo.deployment.model.edit/"
overwrite="true"/> 
+   <ant:delete dir="../plugins/org.apache.geronimo.deployment.model/bin"/>
   </goal>
 	
 	<goal name="genmodels" prereqs="importschemas">

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
Wed Dec  7 10:08:09 2005
@@ -10,7 +10,8 @@
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi
 Eclipse-AutoStart: true
-Export-Package: org.apache.geronimo.xml.ns.deployment,
+Export-Package: org.apache.geronimo.deployment.model,
+ org.apache.geronimo.xml.ns.deployment,
  org.apache.geronimo.xml.ns.deployment.impl,
  org.apache.geronimo.xml.ns.deployment.util,
  org.apache.geronimo.xml.ns.j2ee.application,
@@ -22,15 +23,15 @@
  org.apache.geronimo.xml.ns.j2ee.connector,
  org.apache.geronimo.xml.ns.j2ee.connector.impl,
  org.apache.geronimo.xml.ns.j2ee.connector.util,
+ org.apache.geronimo.xml.ns.j2ee.web,
+ org.apache.geronimo.xml.ns.j2ee.web.impl,
+ org.apache.geronimo.xml.ns.j2ee.web.util,
  org.apache.geronimo.xml.ns.naming,
  org.apache.geronimo.xml.ns.naming.impl,
  org.apache.geronimo.xml.ns.naming.util,
  org.apache.geronimo.xml.ns.security,
  org.apache.geronimo.xml.ns.security.impl,
  org.apache.geronimo.xml.ns.security.util,
- org.apache.geronimo.xml.ns.web,
- org.apache.geronimo.xml.ns.web.impl,
- org.apache.geronimo.xml.ns.web.util,
  org.openejb.xml.ns.openejb.jar,
  org.openejb.xml.ns.openejb.jar.impl,
  org.openejb.xml.ns.openejb.jar.util,

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoUtils.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/GeronimoUtils.java?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
Wed Dec  7 10:08:09 2005
@@ -26,10 +26,10 @@
 import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
 import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
 import org.apache.geronimo.xml.ns.j2ee.connector.util.ConnectorResourceFactoryImpl;
-import org.apache.geronimo.xml.ns.web.DocumentRoot;
-import org.apache.geronimo.xml.ns.web.WebAppType;
-import org.apache.geronimo.xml.ns.web.WebPackage;
-import org.apache.geronimo.xml.ns.web.util.WebResourceFactoryImpl;
+import org.apache.geronimo.xml.ns.j2ee.web.DocumentRoot;
+import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
+import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
+import org.apache.geronimo.xml.ns.j2ee.web.util.WebResourceFactoryImpl;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/DeploymentPlanCreationOperation.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/DeploymentPlanCreationOperation.java?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/DeploymentPlanCreationOperation.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/DeploymentPlanCreationOperation.java
Wed Dec  7 10:08:09 2005
@@ -24,9 +24,8 @@
 import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
 import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorFactory;
 import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
-import org.apache.geronimo.xml.ns.web.DocumentRoot;
-import org.apache.geronimo.xml.ns.web.WebAppType;
-import org.apache.geronimo.xml.ns.web.WebFactory;
+import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
+import org.apache.geronimo.xml.ns.j2ee.web.WebFactory;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IAdaptable;
@@ -125,7 +124,7 @@
 		GeronimoUtils.registerWebFactoryAndPackage(resourceSet);
 
 		Resource resource = resourceSet.createResource(uri);
-		DocumentRoot documentRoot = WebFactory.eINSTANCE.createDocumentRoot();
+		org.apache.geronimo.xml.ns.j2ee.web.DocumentRoot documentRoot = WebFactory.eINSTANCE.createDocumentRoot();
 
 		EMap map = documentRoot.getXMLNSPrefixMap();
 		map.put("", GeronimoSchemaNS.GERONIMO_WEB_NS);

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
Wed Dec  7 10:08:09 2005
@@ -21,9 +21,9 @@
 import org.apache.geronimo.ui.pages.NamingFormPage;
 import org.apache.geronimo.ui.pages.SecurityPage;
 import org.apache.geronimo.ui.pages.WebGeneralPage;
-import org.apache.geronimo.xml.ns.web.WebFactory;
-import org.apache.geronimo.xml.ns.web.WebPackage;
-import org.apache.geronimo.xml.ns.web.impl.WebPackageImpl;
+import org.apache.geronimo.xml.ns.j2ee.web.WebFactory;
+import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
+import org.apache.geronimo.xml.ns.j2ee.web.impl.WebPackageImpl;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.ui.PartInitException;

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/WebGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/WebGeneralSection.java?rev=354821&r1=354820&r2=354821&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/WebGeneralSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/WebGeneralSection.java
Wed Dec  7 10:08:09 2005
@@ -16,8 +16,8 @@
 package org.apache.geronimo.ui.sections;
 
 import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.xml.ns.web.WebAppType;
-import org.apache.geronimo.xml.ns.web.WebPackage;
+import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
+import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.swt.SWT;



Mime
View raw message