You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/10/14 05:16:15 UTC
svn commit: r320985 - in
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core:
internal/GeronimoSchemaNS.java
operations/DeploymentPlanCreationOperation.java
Author: sppatel
Date: Thu Oct 13 20:16:10 2005
New Revision: 320985
URL: http://svn.apache.org/viewcvs?rev=320985&view=rev
Log:
add sec/nam ns prefix
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/DeploymentPlanCreationOperation.java
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.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/GeronimoSchemaNS.java?rev=320985&r1=320984&r2=320985&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java Thu Oct 13 20:16:10 2005
@@ -24,5 +24,9 @@
public static final String GERONIMO_OPENEJB_NS = "http://www.openejb.org/xml/ns/openejb-jar-2.0";
public static final String GERONIMO_CONNECTOR_NS = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.0";
+
+ public static final String GERONIMO_NAMING_NS = "http://geronimo.apache.org/xml/ns/naming-1.0";
+
+ public static final String GERONIMO_SECURITY_NS = "http://geronimo.apache.org/xml/ns/security-1.0";
}
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=320985&r1=320984&r2=320985&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 Thu Oct 13 20:16:10 2005
@@ -33,6 +33,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -45,7 +46,8 @@
import org.openejb.xml.ns.openejb.jar.JarFactory;
import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
-public class DeploymentPlanCreationOperation extends AbstractGeronimoJ2EEComponentOperation {
+public class DeploymentPlanCreationOperation extends
+ AbstractGeronimoJ2EEComponentOperation {
public DeploymentPlanCreationOperation() {
}
@@ -97,8 +99,8 @@
ApplicationType root = ApplicationFactory.eINSTANCE
.createApplicationType();
- documentRoot.getXMLNSPrefixMap()
- .put("", GeronimoSchemaNS.GERONIMO_APP_NS);
+ documentRoot.getXMLNSPrefixMap().put("",
+ GeronimoSchemaNS.GERONIMO_APP_NS);
root.setApplicationName(getComponentName());
root.setConfigId(getProject().getName() + "/" + getComponentName());
@@ -122,8 +124,9 @@
Resource resource = resourceSet.createResource(uri);
DocumentRoot documentRoot = WebFactory.eINSTANCE.createDocumentRoot();
- documentRoot.getXMLNSPrefixMap()
- .put("", GeronimoSchemaNS.GERONIMO_WEB_NS);
+ EMap map = documentRoot.getXMLNSPrefixMap();
+ map.put("", GeronimoSchemaNS.GERONIMO_WEB_NS);
+ map.put("sec", GeronimoSchemaNS.GERONIMO_SECURITY_NS);
WebAppType root = WebFactory.eINSTANCE.createWebAppType();
@@ -192,7 +195,7 @@
private void doSave(Resource resource) {
if (resource instanceof XMLResource) {
((XMLResource) resource).setEncoding("UTF-8");
- }
+ }
try {
resource.save(Collections.EMPTY_MAP);