You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2009/10/11 15:27:38 UTC
svn commit: r824070 [2/3] - in
/geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/xml/ns/j2ee/application_client_1/
org.apache.geronimo.st.core/ org.apache.geronimo.st.core/META-INF...
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java?rev=824070&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java Sun Oct 11 13:27:37 2009
@@ -0,0 +1,711 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.st.v11.core.internal;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.st.core.DeploymentUtils;
+import org.apache.geronimo.st.core.GeronimoUtils;
+import org.apache.geronimo.st.core.jaxb.JAXBUtils;
+import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
+import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
+import org.apache.geronimo.xml.ns.deployment_1.ObjectFactory;
+import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType;
+import org.apache.geronimo.xml.ns.j2ee.application_client_1.ApplicationClientType;
+import org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType;
+import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
+import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
+
+/**
+ * <b>DependencyHelper</b> is a helper class with various methods to aid in the discovery of
+ * inter-dependencies between modules being deployed from the GEP to the Geronimo server. It
+ * performs the following capabilities:
+ * <ol>
+ * <li>Discovery of dependencies between modules<p>
+ * <li>Provides the proper publishing ordering of the modules based on the discovered
+ * dependencies<p>
+ * <li><b>TODO:</b> Query the server searching for missing dependencies
+ * </ol>
+ *
+ * @version $Rev: 817996 $ $Date: 2009-09-23 16:04:12 +0800 (Wed, 23 Sep 2009) $
+ */
+public class DependencyHelper {
+
+ private DependencyManager dm = new DependencyManager();
+ private ObjectFactory deploymentFactory = new ObjectFactory();
+ private List inputModules = new ArrayList();
+ private List inputDeltaKind = new ArrayList();
+ private List reorderedModules = new ArrayList();
+ private List reorderedKinds = new ArrayList();
+ private List<JAXBElement> inputJAXBElements = new ArrayList();
+ private List<JAXBElement> reorderedJAXBElements = new ArrayList();
+
+
+ /**
+ * Reorder the publish order of the modules based on any discovered dependencies
+ *
+ * @param modules Modules to be published to the Geronimo server
+ * @param deltaKind Publish kind constant for each module
+ *
+ * @return List of reordered modules and deltaKind (or input if no change)
+ */
+ public List reorderModules(IServer server, List modules, List deltaKind ) {
+ Trace.tracePoint("Entry", "DependencyHelper.reorderModules", modules, deltaKind);
+
+ if (modules.size() == 0) {
+ List reorderedLists = new ArrayList(2);
+ reorderedLists.add(modules);
+ reorderedLists.add(deltaKind);
+ Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedLists);
+ return reorderedLists;
+ }
+
+ inputModules = modules;
+ inputDeltaKind = deltaKind;
+
+ //
+ // Iterate through all the modules and register the dependencies
+ //
+ for (int ii=0; ii<modules.size(); ii++) {
+ IModule[] module = (IModule[]) modules.get(ii);
+ int moduleDeltaKind = ((Integer)deltaKind.get(ii)).intValue();
+ if (moduleDeltaKind != ServerBehaviourDelegate.REMOVED) {
+ //GERONIMODEVTOOLS-361
+ for (IModule singleModule:module){
+ EnvironmentType environment = getEnvironment(singleModule);
+ if (environment != null) {
+ ArtifactType child = environment.getModuleId();
+ DependenciesType dependencies = environment.getDependencies();
+ if (dependencies != null) {
+ List<DependencyType> depList = dependencies.getDependency();
+ for ( DependencyType dep : depList) {
+ ArtifactType parent = deploymentFactory.createArtifactType();
+ parent.setGroupId( dep.getGroupId() );
+ parent.setArtifactId( dep.getArtifactId() );
+ parent.setVersion( dep.getVersion() );
+ parent.setType( dep.getType() );
+
+ StringBuilder configId = new StringBuilder();
+ if (dep.getGroupId()!=null)
+ configId.append(dep.getGroupId());
+ configId.append("/");
+ if (dep.getArtifactId()!=null)
+ configId.append(dep.getArtifactId());
+ configId.append("/");
+ if (dep.getVersion()!=null)
+ configId.append(dep.getVersion());
+ configId.append("/");
+ if (dep.getType()!=null)
+ configId.append(dep.getType());
+
+ if (!DeploymentUtils.isInstalledModule(server,configId.toString()))
+ dm.addDependency( child, parent );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // Iterate through all the modules again and reorder as necessary
+ //
+ for (int ii=0; ii<modules.size(); ii++) {
+ IModule[] module = (IModule[]) modules.get(ii);
+ int moduleDeltaKind = ((Integer)deltaKind.get(ii)).intValue();
+ if (module!=null && !reorderedModules.contains(module)) {
+ // Not already moved
+ if (moduleDeltaKind == ServerBehaviourDelegate.REMOVED) {
+ // Move module if going to be removed
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ else {
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType artifact = environment.getModuleId();
+ if (artifact == null) {
+ // Move if null (nothing can be done)
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else if (dm.getParents(artifact).contains(artifact) ||
+ dm.getChildren(artifact).contains(artifact)) {
+ // Move if a tight circular dependency (nothing can be done)
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else if (dm.getParents(artifact).size() == 0) {
+ // Move if no parents (nothing to do)
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else if (dm.getParents(artifact).size() > 0) {
+ // Move parents first
+ processParents(dm.getParents(artifact), artifact);
+ // Move self
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ }else {
+ //no environment defined, do just as no parents
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // Ensure return lists are exactly the same size as the input lists
+ //
+ assert reorderedModules.size() == modules.size();
+ assert reorderedKinds.size() == deltaKind.size();
+
+ //
+ // Return List of lists
+ //
+ List reorderedLists = new ArrayList(2);
+ reorderedLists.add(reorderedModules);
+ reorderedLists.add(reorderedKinds);
+
+ Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedLists);
+ return reorderedLists;
+ }
+
+
+ /**
+ * Reorder the list of JAXBElements based on any discovered dependencies
+ *
+ * @param jaxbElements
+ *
+ * @return List of JAXBElements (or input if no change)
+ */
+ public List<JAXBElement> reorderJAXBElements( List<JAXBElement> jaxbElements ) {
+ Trace.tracePoint("Entry", "DependencyHelper.reorderModules", jaxbElements);
+
+ if (jaxbElements.size() == 0) {
+ Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", jaxbElements);
+ return jaxbElements;
+ }
+
+ inputJAXBElements = jaxbElements;
+
+ //
+ // Iterate through all the JAXBElements and register the dependencies
+ //
+ for (JAXBElement jaxbElement : jaxbElements) {
+ EnvironmentType environment = getEnvironment(jaxbElement);
+ if (environment != null) {
+ ArtifactType child = environment.getModuleId();
+ if (child != null) {
+ DependenciesType dependencies = environment.getDependencies();
+ if (dependencies != null) {
+ List<DependencyType> depList = dependencies.getDependency();
+ if (depList != null) {
+ for ( DependencyType dep : depList) {
+ ArtifactType parent = deploymentFactory.createArtifactType();
+ parent.setGroupId( dep.getGroupId() );
+ parent.setArtifactId( dep.getArtifactId() );
+ parent.setVersion( dep.getVersion() );
+ parent.setType( dep.getType() );
+ dm.addDependency( child, parent );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // Iterate through all the JAXBElements again and reorder as necessary
+ //
+ for (JAXBElement jaxbElement : jaxbElements) {
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ // Not already moved
+ EnvironmentType environment = getEnvironment(jaxbElement);
+ if (environment != null) {
+ ArtifactType artifact = environment.getModuleId();
+ if (artifact == null) {
+ // Move if null (nothing can be done)
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ reorderedJAXBElements.add(jaxbElement);
+ }
+ }
+ else if (dm.getParents(artifact).contains(artifact) ||
+ dm.getChildren(artifact).contains(artifact)) {
+ // Move if a tight circular dependency (nothing can be done)
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ reorderedJAXBElements.add(jaxbElement);
+ }
+ }
+ else if (dm.getParents(artifact).size() == 0) {
+ // Move if no parents (nothing to do)
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ reorderedJAXBElements.add(jaxbElement);
+ }
+ }
+ else if (dm.getParents(artifact).size() > 0) {
+ // Move parents first
+ processJaxbParents(dm.getParents(artifact), artifact);
+ // Move self
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ reorderedJAXBElements.add(jaxbElement);
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // Ensure return list is exactly the same size as the input list
+ //
+ assert reorderedJAXBElements.size() == jaxbElements.size();
+
+ //
+ // Return List of JAXBElements
+ //
+ Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedJAXBElements);
+ return reorderedJAXBElements;
+ }
+
+
+ /**
+ *
+ */
+ public void close() {
+ dm.close();
+ }
+
+
+ /*--------------------------------------------------------------------------------------------*\
+ | |
+ | Private method(s) |
+ | |
+ \*--------------------------------------------------------------------------------------------*/
+
+ /**
+ * Process the parents for a given artifact. The terminatingArtifact parameter will be used as
+ * the terminating condition to ensure there will not be an infinite loop (i.e., if
+ * terminatingArtifact is encountered again there is a circular dependency).
+ *
+ * @param parents
+ * @param terminatingArtifact
+ */
+ private void processParents(Set parents, ArtifactType terminatingArtifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.processParents", parents, terminatingArtifact );
+
+ if (parents == null) {
+ Trace.tracePoint("Exit ", "DependencyHelper.processParents", null);
+ return;
+ }
+ for (Iterator ii = parents.iterator(); ii.hasNext();) {
+ ArtifactType artifact = (ArtifactType)ii.next();
+ if (dm.getParents(artifact).size() > 0 && !artifact.equals(terminatingArtifact) &&
+ !dm.getParents(artifact).contains(artifact) && !dm.getChildren(artifact).contains(artifact)) {
+ // Keep processing parents (as long as no circular dependencies)
+ processParents(dm.getParents(artifact), terminatingArtifact);
+ // Move self
+ IModule[] module = getModule(artifact);
+ int moduleDeltaKind = getDeltaKind(artifact);
+ if (module!=null && !reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else {
+ // Move parent
+ IModule[] module = getModule(artifact);
+ int moduleDeltaKind = getDeltaKind(artifact);
+ if (module!=null && !reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.processParents");
+ }
+
+
+ /**
+ * Returns the Environment for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return Environment
+ */
+ private EnvironmentType getEnvironment(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getEnvironment", module);
+
+ EnvironmentType environment = null;
+ if (GeronimoUtils.isWebModule(module)) {
+ if (getWebDeploymentPlan(module) != null) {
+ WebAppType plan = getWebDeploymentPlan(module).getValue();
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ }
+ else if (GeronimoUtils.isEjbJarModule(module)) {
+ if (getOpenEjbDeploymentPlan(module) != null) {
+ OpenejbJarType plan = getOpenEjbDeploymentPlan(module).getValue();
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ }
+ else if (GeronimoUtils.isEarModule(module)) {
+ if (getApplicationDeploymentPlan(module) != null) {
+ ApplicationType plan = getApplicationDeploymentPlan(module).getValue();
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ }
+ else if (GeronimoUtils.isRARModule(module)) {
+ if (getConnectorDeploymentPlan(module) != null) {
+ ConnectorType plan = getConnectorDeploymentPlan(module).getValue();
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ }else if (GeronimoUtils.isAppClientModule(module)) {
+ if (getAppClientDeploymentPlan(module) != null) {
+ ApplicationClientType plan = getAppClientDeploymentPlan(module).getValue();
+ if (plan != null)
+ environment = plan.getServerEnvironment();
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
+ return environment;
+ }
+
+
+ /**
+ * Return the IModule[] for a given artifact
+ *
+ * @param artifact
+ *
+ * @return IModule[]
+ */
+ private IModule[] getModule(ArtifactType artifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.getModule", artifact);
+
+ for (int ii=0; ii<inputModules.size(); ii++) {
+ IModule[] module = (IModule[]) inputModules.get(ii);
+ int moduleDeltaKind = ((Integer)inputDeltaKind.get(ii)).intValue();
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType moduleArtifact = environment.getModuleId();
+ if (artifact.equals(moduleArtifact)) {
+ Trace.tracePoint("Exit ", "DependencyHelper.getModule", module);
+ return module;
+ }
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getModule", null);
+ return null;
+ }
+
+
+ /**
+ * Return the deltaKind array index for a given artifact
+ *
+ * @param artifact
+ *
+ * @return int
+ */
+ private int getDeltaKind(ArtifactType artifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.getDeltaKind", artifact);
+
+ for (int ii=0; ii<inputModules.size(); ii++) {
+ IModule[] module = (IModule[]) inputModules.get(ii);
+ int moduleDeltaKind = ((Integer)inputDeltaKind.get(ii)).intValue();
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType moduleArtifact = environment.getModuleId();
+ if (artifact.equals(moduleArtifact)) {
+ Trace.tracePoint("Exit ", "DependencyHelper.getDeltaKind", moduleDeltaKind);
+ return moduleDeltaKind;
+ }
+ }
+ }
+ Trace.tracePoint("Exit ", "DependencyHelper.getDeltaKind", 0);
+ return 0;
+ }
+
+
+ /**
+ * Returns the WebApp for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return WebApp
+ */
+ private JAXBElement<WebAppType> getWebDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getWebDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getWebDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.WEB_PLAN_NAME) && file.exists()) {
+ try {
+ Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
+ } catch (Exception e) {
+ //ignore it, just indicate error by returning null
+ }
+
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", null);
+ return null;
+ }
+
+
+ /**
+ * Returns the OpenEjbJar for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return OpenEjbJar
+ */
+ private JAXBElement<OpenejbJarType> getOpenEjbDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getOpenEjbDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.OPENEJB_PLAN_NAME) && file.exists()) {
+ try {
+ Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ } catch (Exception e) {
+ //ignore it, just indicate error by returning null
+ }
+ try {
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
+ } catch (Exception e) {
+ //ignore it, just indicate error by returning null
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", null);
+ return null;
+ }
+
+ /**
+ * Returns the ApplicationClient for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return ApplicationClient
+ */
+ private JAXBElement<ApplicationClientType> getAppClientDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getWebDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getApplicationClientDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.APP_CLIENT_PLAN_NAME) && file.exists()) {
+ try {
+ Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
+ } catch (Exception e) {
+ //ignore it, just indicate error by returning null
+ }
+
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", null);
+ return null;
+ }
+
+ /**
+ * Returns the Application for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return Application
+ */
+ private JAXBElement<ApplicationType> getApplicationDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getApplicationDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.APP_PLAN_NAME) && file.exists()) {
+ try {
+ Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
+ } catch (Exception e) {
+ //ignore it, just indicate error by returning null
+ }
+
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", null);
+ return null;
+ }
+
+
+ /**
+ * Returns the Connector for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return Application
+ */
+ private JAXBElement<ConnectorType> getConnectorDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getConnectorDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.CONNECTOR_PLAN_NAME) && file.exists()) {
+ try {
+ Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
+ } catch (Exception e) {
+ //ignore it, just indicate error by returning null
+ }
+
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan", null);
+ return null;
+ }
+
+
+ /**
+ * Process the parents for a given artifact. The terminatingArtifact parameter will be used as
+ * the terminating condition to ensure there will not be an infinite loop (i.e., if
+ * terminatingArtifact is encountered again there is a circular dependency).
+ *
+ * @param parents
+ * @param terminatingArtifact
+ */
+ private void processJaxbParents(Set parents, ArtifactType terminatingArtifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.processJaxbParents", parents, terminatingArtifact );
+
+ if (parents == null) {
+ Trace.tracePoint("Exit ", "DependencyHelper.processJaxbParents", null);
+ return;
+ }
+ for (Iterator ii = parents.iterator(); ii.hasNext();) {
+ ArtifactType artifact = (ArtifactType)ii.next();
+ if (dm.getParents(artifact).size() > 0 && !artifact.equals(terminatingArtifact) &&
+ !dm.getParents(artifact).contains(artifact) && !dm.getChildren(artifact).contains(artifact)) {
+ // Keep processing parents (as long as no circular dependencies)
+ processJaxbParents(dm.getParents(artifact), terminatingArtifact);
+ // Move self
+ JAXBElement jaxbElement = getJaxbElement(artifact);
+ if (jaxbElement != null) {
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ reorderedJAXBElements.add(jaxbElement);
+ }
+ }
+ }
+ else {
+ // Move parent
+ JAXBElement jaxbElement = getJaxbElement(artifact);
+ if (jaxbElement != null) {
+ if (!reorderedJAXBElements.contains(jaxbElement)) {
+ reorderedJAXBElements.add(jaxbElement);
+ }
+ }
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.processJaxbParents");
+ }
+
+
+ /**
+ * Returns the Environment for the given JAXBElement plan
+ *
+ * @param jaxbElement JAXBElement plan
+ *
+ * @return Environment
+ */
+ private EnvironmentType getEnvironment(JAXBElement jaxbElement) {
+ Trace.tracePoint("Enter", "DependencyHelper.getEnvironment", jaxbElement);
+
+ EnvironmentType environment = null;
+ Object plan = jaxbElement.getValue();
+ if (plan != null) {
+ if (WebAppType.class.isInstance(plan)) {
+ environment = ((WebAppType)plan).getEnvironment();
+ }
+ else if (OpenejbJarType.class.isInstance(plan)) {
+ environment = ((OpenejbJarType)plan).getEnvironment();
+ }
+ else if (ApplicationType.class.isInstance(plan)) {
+ environment = ((ApplicationType)plan).getEnvironment();
+ }
+ else if (ConnectorType.class.isInstance(plan)) {
+ environment = ((ConnectorType)plan).getEnvironment();
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
+ return environment;
+ }
+
+
+ /**
+ * Return the JAXBElement for a given artifact
+ *
+ * @param artifact
+ *
+ * @return JAXBElement
+ */
+ private JAXBElement getJaxbElement(ArtifactType artifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.getJaxbElement", artifact);
+
+ for (JAXBElement jaxbElement : inputJAXBElements) {
+ EnvironmentType environment = getEnvironment(jaxbElement);
+ if (environment != null) {
+ ArtifactType jaxbArtifact = environment.getModuleId();
+ if (artifact.equals(jaxbArtifact)) {
+ Trace.tracePoint("Exit ", "DependencyHelper.getJaxbElement", jaxbElement);
+ return jaxbElement;
+ }
+ }
+ }
+
+ // TODO: Query the server searching for missing dependencies
+ Trace.tracePoint("Exit ", "DependencyHelper.getJaxbElement", null);
+ return null;
+ }
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyManager.java?rev=824070&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyManager.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyManager.java Sun Oct 11 13:27:37 2009
@@ -0,0 +1,214 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.st.v11.core.internal;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+
+
+/**
+ * <b>DependencyManager</b> is very closely-based on the similar class in the Geronimo server.
+ * DependencyManager is the record keeper of the dependencies in the Geronimo Eclipse Plugin. The
+ * DependencyManager does not enforce any dependencies, it is simply a place where components can
+ * register their intent to be dependent on another component, and where other components can query
+ * those dependencies.
+ *
+ * <p>Like the DependencyManager in the Geronimo server, it uses the nomenclature of parent-child
+ * where a child is dependent on a parent. The names parent and child have no other meaning are just
+ * a convenience to make the code readable.
+ *
+ * <p>The initial usage of this DependencyManager in the GEP is somewhat limited but other usages
+ * are possible<p>
+ *
+ * @version $Rev: 680897 $ $Date: 2008-07-30 09:18:42 +0800 (Wed, 30 Jul 2008) $
+ */
+public class DependencyManager {
+
+ //
+ // Map from child to a list of parents
+ //
+ private final Map childToParentMap = new HashMap();
+
+ //
+ // Map from parent back to a list of its children
+ //
+ private final Map parentToChildMap = new HashMap();
+
+
+ /**
+ *
+ */
+ public void close() {
+ childToParentMap.clear();
+ parentToChildMap.clear();
+ }
+
+
+ /**
+ * Declares a dependency from a child to a parent.
+ *
+ * @param child the dependent component
+ * @param parent the component the child is depending on
+ */
+ public void addDependency(ArtifactType child, ArtifactType parent) {
+ Trace.tracePoint("Entry", "DependencyManager.addDependency", child, parent);
+
+ Set parents = (Set) childToParentMap.get(child);
+ if (parents == null) {
+ parents = new LinkedHashSet();
+ childToParentMap.put(child, parents);
+ }
+ parents.add(parent);
+
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children == null) {
+ children = new LinkedHashSet();
+ parentToChildMap.put(parent, children);
+ }
+ children.add(child);
+
+ Trace.tracePoint("Exit ", "DependencyManager.addDependency", childToParentMap.size() );
+ Trace.tracePoint("Exit ", "DependencyManager.addDependency", parentToChildMap.size() );
+ }
+
+
+ /**
+ * Removes a dependency from a child to a parent
+ *
+ * @param child the dependnet component
+ * @param parent the component that the child wil no longer depend on
+ */
+ public void removeDependency(ArtifactType child, ArtifactType parent) {
+ Trace.tracePoint("Entry", "DependencyManager.removeDependency", child, parent);
+
+ Set parents = (Set) childToParentMap.get(child);
+ if (parents != null) {
+ parents.remove(parent);
+ }
+
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children != null) {
+ children.remove(child);
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.addDependency");
+ }
+
+
+ /**
+ * Removes all dependencies for a child
+ *
+ * @param child the component that will no longer depend on anything
+ */
+ public void removeAllDependencies(ArtifactType child) {
+ Trace.tracePoint("Entry", "DependencyManager.removeAllDependencies", child);
+
+ Set parents = (Set) childToParentMap.remove(child);
+ if (parents == null) {
+ return;
+ }
+
+ for (Iterator iterator = parents.iterator(); iterator.hasNext();) {
+ ArtifactType parent = (ArtifactType) iterator.next();
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children != null) {
+ children.remove(child);
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.removeAllDependencies");
+ }
+
+
+ /**
+ * Adds dependencies from the child to every parent in the parents set
+ *
+ * @param child the dependent component
+ * @param parents the set of components the child is depending on
+ */
+ public void addDependencies(ArtifactType child, Set parents) {
+ Trace.tracePoint("Entry", "DependencyManager.addDependencies", child, parents);
+
+ Set existingParents = (Set) childToParentMap.get(child);
+ if (existingParents == null) {
+ existingParents = new LinkedHashSet(parents);
+ childToParentMap.put(child, existingParents);
+ }
+ else {
+ existingParents.addAll(parents);
+ }
+
+ for (Iterator i = parents.iterator(); i.hasNext();) {
+ Object startParent = i.next();
+ Set children = (Set) parentToChildMap.get(startParent);
+ if (children == null) {
+ children = new LinkedHashSet();
+ parentToChildMap.put(startParent, children);
+ }
+ children.add(child);
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.addDependencies");
+ }
+
+
+ /**
+ * Gets the set of parents that the child is depending on
+ *
+ * @param child the dependent component
+ * @return a collection containing all of the components the child depends on; will never be null
+ */
+ public Set getParents(ArtifactType child) {
+ Trace.tracePoint("Entry", "DependencyManager.getParents", child);
+
+ Set parents = (Set) childToParentMap.get(child);
+ if (parents == null) {
+ Trace.tracePoint("Exit", "DependencyManager.getParents", 0);
+ return Collections.EMPTY_SET;
+ }
+
+ Trace.tracePoint("Exit", "DependencyManager.getParents", parents.size() );
+ return new LinkedHashSet(parents);
+ }
+
+
+ /**
+ * Gets all of the children that have a dependency on the specified parent.
+ *
+ * @param parent the component the returned childen set depend on
+ * @return a collection containing all of the components that depend on the parent; will never be null
+ */
+ public Set getChildren(ArtifactType parent) {
+ Trace.tracePoint("Entry", "DependencyManager.getChildren", parent);
+
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children == null) {
+ Trace.tracePoint("Exit ", "DependencyManager.getChildren", 0);
+ return Collections.EMPTY_SET;
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.getChildren", children.size() );
+ return new LinkedHashSet(children);
+ }
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java?rev=824070&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java Sun Oct 11 13:27:37 2009
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v11.core.jaxb;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.geronimo.st.v11.core.Activator;
+import org.apache.geronimo.st.v11.core.internal.Trace;
+import org.apache.geronimo.st.core.jaxb.IJAXBUtilsProvider;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * @version $Rev: 726047 $ $Date: 2008-12-12 23:35:00 +0800 (Fri, 12 Dec 2008) $
+ */
+public class JAXB11Utils implements IJAXBUtilsProvider{
+
+ // JAXBContext instantiation is costly - must be done only once!
+ private static final JAXBContext jaxbContext = newJAXBContext();
+ private static final MarshallerListener marshallerListener = new MarshallerListener();
+ //private static JAXB11Utils _instance = new JAXB11Utils();
+
+
+ private static JAXBContext newJAXBContext() {
+ try {
+ return JAXBContext.newInstance(
+ "org.apache.geronimo.xml.ns.deployment_1:" +
+ "org.apache.geronimo.xml.ns.j2ee.application_1:" +
+ "org.apache.geronimo.xml.ns.j2ee.application_client_1:" +
+ "org.apache.geronimo.xml.ns.j2ee.connector_1:" +
+ "org.apache.geronimo.xml.ns.j2ee.web_1:" +
+ "org.apache.geronimo.xml.ns.naming_1:" +
+ "org.apache.geronimo.xml.ns.security_1:" +
+ "org.openejb.xml.ns.openejb_jar_2:"+
+ "org.openejb.xml.ns.pkgen_2:"+
+ "org.openejb.xml.ns.corba_css_config_2:"+
+ "org.openejb.xml.ns.corba_tss_config_2:", Activator.class.getClassLoader() );
+ } catch (JAXBException e) {
+ Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /* public JAXB11Utils(){
+ }
+
+ public static JAXB11Utils getInstance(){
+ return _instance;
+ }*/
+
+
+ public void marshalDeploymentPlan(JAXBElement jaxbElement, IFile file) throws Exception {
+ try {
+ Marshaller marshaller = jaxbContext.createMarshaller();
+ marshaller.setListener(marshallerListener);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document doc = db.newDocument();
+
+ marshaller.marshal(jaxbElement, doc);
+
+ TransformerFactory xf = TransformerFactory.newInstance();
+ try {
+ xf.setAttribute("indent-number", new Integer(4));
+ } catch (IllegalArgumentException iae) {
+ //ignore this. http://forums.sun.com/thread.jspa?threadID=562510&messageID=2841867
+ }
+ Transformer xformer = xf.newTransformer();
+ xformer.setOutputProperty(OutputKeys.METHOD, "xml");
+ xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ xformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+ xformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4");
+
+ ByteArrayOutputStream outBuffer = new ByteArrayOutputStream();
+ Result out = new StreamResult(new OutputStreamWriter(outBuffer,"UTF-8"));
+ NamespacePrefix.processPrefix(doc);
+
+ xformer.transform(new DOMSource(doc), out);
+ ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
+ if(file.exists()) {
+ file.setContents(inBuffer, true, false, null);
+ } else {
+ prepareFolder(file.getParent());
+ file.create(inBuffer, true, null);
+ }
+ } catch (JAXBException jaxbException) {
+ Trace.tracePoint("JAXBException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ throw jaxbException;
+ } catch (CoreException coreException) {
+ Trace.tracePoint("CoreException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ throw coreException;
+ } catch (ParserConfigurationException e) {
+ Trace.tracePoint("ParserConfigurationException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ throw e;
+ } catch (TransformerConfigurationException e) {
+ Trace.tracePoint("TransformerConfigurationException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ throw e;
+ } catch (UnsupportedEncodingException e) {
+ Trace.tracePoint("UnsupportedEncodingException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ throw e;
+ } catch (TransformerException e) {
+ Trace.tracePoint("TransformerException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ throw e;
+ }
+ }
+
+ public JAXBElement unmarshalFilterDeploymentPlan(IFile file) throws Exception {
+ try {
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setValidating(false);
+ SAXParser parser = factory.newSAXParser();
+ SAXSource source = new SAXSource(null, new InputSource(file.getContents()));
+ JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
+ return plan;
+ } catch (JAXBException e) {
+ Trace.tracePoint("JAXBException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ throw e;
+ } catch (CoreException e) {
+ Trace.tracePoint("CoreException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ throw e;
+ } catch (ParserConfigurationException e) {
+ Trace.tracePoint("ParserConfigurationException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ throw e;
+ } catch (SAXException e) {
+ Trace.tracePoint("SAXException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ throw e;
+ }
+ }
+
+ private void prepareFolder(IContainer folder) throws CoreException {
+ if (folder.exists() || !(folder instanceof IFolder)) {
+ return;
+ }
+ // prepare the upper level folders recursively
+ prepareFolder(folder.getParent());
+ ((IFolder) folder).create(true, true, null);
+ }
+
+ public Object getValue( Object element, String name ) throws Exception {
+ try {
+ if (String.class.isInstance(element))
+ return (String)element;
+ Method method = element.getClass().getMethod( "get" + name, null);
+ return method.invoke(element, null);
+ } catch ( Exception e ) {
+ throw e;
+ }
+ }
+
+ public void setValue( Object element, String name, Object value ) throws Exception {
+ try {
+ Method[] methods = element.getClass().getMethods();
+ for ( Method method: methods) {
+ if ( method.getName().equals( "set" + name ) ) {
+ method.invoke( element, value );
+ return;
+ }
+ }
+ } catch (Exception e) {
+ throw e;
+ }
+ System.out.println( "============== No such method set" + name + " in class " + element.getClass().getName() );
+ }
+
+ public JAXBContext getJAXBContext() {
+ return jaxbContext;
+ }
+
+ public void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream)
+ throws Exception {
+
+ }
+
+ public JAXBElement unmarshalPlugin(InputStream inputStream) {
+ return null;
+ }
+}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXBObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXBObjectFactoryImpl.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXBObjectFactoryImpl.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXBObjectFactoryImpl.java Sun Oct 11 13:27:37 2009
@@ -16,7 +16,6 @@
*/
package org.apache.geronimo.st.v11.core.jaxb;
-import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
import org.apache.geronimo.xml.ns.deployment.javabean_1.PropertyType;
import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
import org.apache.geronimo.xml.ns.deployment_1.AttributeType;
@@ -59,7 +58,7 @@
/**
* @version $Rev: 705268 $ $Date: 2008-10-16 23:54:29 +0800 (Thu, 16 Oct 2008) $
*/
-public class JAXBObjectFactoryImpl implements JAXBObjectFactory {
+public class JAXBObjectFactoryImpl implements org.apache.geronimo.st.core.jaxb.JAXBObjectFactory {
private static JAXBObjectFactoryImpl instance = new JAXBObjectFactoryImpl();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java Sun Oct 11 13:27:37 2009
@@ -17,7 +17,7 @@
package org.apache.geronimo.st.v11.core.operations;
import org.apache.geronimo.st.core.GeronimoFacetInstallDelegate;
-import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v11.core.internal.Trace;
import org.eclipse.core.resources.IProject;
import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java Sun Oct 11 13:27:37 2009
@@ -21,7 +21,7 @@
import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
import org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig;
import org.apache.geronimo.st.v11.core.internal.Trace;
-import org.apache.geronimo.st.v11.core.jaxb.JAXBUtils;
+import org.apache.geronimo.st.core.jaxb.JAXBUtils;
import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF Sun Oct 11 13:27:37 2009
@@ -5,6 +5,7 @@
Bundle-Version: 2.2.0
Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
Bundle-Vendor: Apache.org
+Bundle-Localization: plugin
Require-Bundle: org.apache.geronimo.runtime.common,
org.apache.geronimo.runtime.v11;bundle-version="2.2.0",
org.apache.geronimo.st.ui,
@@ -19,6 +20,10 @@
org.apache.geronimo.st.v11.core,
org.apache.geronimo.st.v21.core,
org.eclipse.wst.server.ui,
- org.eclipse.wst.server.core
+ org.eclipse.wst.server.core,
+ org.eclipse.ui.ide,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.jface.text;bundle-version="3.5.0"
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.geronimo.st.v21.core.jaxb
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml Sun Oct 11 13:27:37 2009
@@ -35,5 +35,6 @@
<page class="org.apache.geronimo.st.v11.ui.wizards.FacetInstallPage"/>
</wizard-pages>
</extension>
+
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java Sun Oct 11 13:27:37 2009
@@ -18,7 +18,7 @@
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.st.v11.core.jaxb.JAXBUtils;
+import org.apache.geronimo.st.core.jaxb.JAXBUtils;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppClientGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppClientGeneralPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppClientGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppClientGeneralPage.java Sun Oct 11 13:27:37 2009
@@ -18,7 +18,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.ui.sections.AppClientClientGeneralSection;
import org.apache.geronimo.st.v11.ui.sections.AppClientServerGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java Sun Oct 11 13:27:37 2009
@@ -18,7 +18,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.ui.sections.AppGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java Sun Oct 11 13:27:37 2009
@@ -19,7 +19,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v11.ui.sections.AdminObjectSection;
import org.apache.geronimo.st.v11.ui.sections.ClassFilterSection;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java Sun Oct 11 13:27:37 2009
@@ -17,7 +17,7 @@
package org.apache.geronimo.st.v11.ui.pages;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.ui.sections.OpenEjbJarCMPSection;
import org.apache.geronimo.st.v11.ui.sections.OpenEjbJarGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java Sun Oct 11 13:27:37 2009
@@ -19,7 +19,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.ui.sections.EjbLocalRefSection;
import org.apache.geronimo.st.v11.ui.sections.EjbRefSection;
import org.apache.geronimo.st.v11.ui.sections.EjbRelationSection;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java Sun Oct 11 13:27:37 2009
@@ -18,7 +18,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.ui.sections.SecurityRoleMappingSection;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.ui.forms.IManagedForm;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java Sun Oct 11 13:27:37 2009
@@ -18,7 +18,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
import org.apache.geronimo.st.v11.ui.sections.WebContainerSection;
import org.apache.geronimo.st.v11.ui.sections.WebGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/CommonGeneralSection.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/CommonGeneralSection.java Sun Oct 11 13:27:37 2009
@@ -50,7 +50,7 @@
*/
public abstract class CommonGeneralSection extends AbstractSectionPart {
- protected Text artifactTypeId;
+ protected Text artifactId;
protected Text groupId;
@@ -100,13 +100,13 @@
}
});
- createLabel(composite, CommonMessages.artifactType);
+ createLabel(composite, CommonMessages.artifactId);
- artifactTypeId = toolkit.createText(composite, getArtifactTypeId(), SWT.BORDER);
- artifactTypeId.setLayoutData(createTextFieldGridData());
- artifactTypeId.addModifyListener(new ModifyListener() {
+ artifactId = toolkit.createText(composite, getArtifactId(), SWT.BORDER);
+ artifactId.setLayoutData(createTextFieldGridData());
+ artifactId.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- getModuleId(true).setArtifactId(artifactTypeId.getText());
+ getModuleId(true).setArtifactId(artifactId.getText());
markDirty();
}
});
@@ -124,7 +124,7 @@
createLabel(composite, CommonMessages.artifactType);
- type = toolkit.createText(composite, getArtifactType(), SWT.BORDER);
+ type = toolkit.createText(composite, getArtifact(), SWT.BORDER);
type.setLayoutData(createTextFieldGridData());
type.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -150,7 +150,7 @@
});
suppressDefaultEnv = toolkit.createButton(composite, CommonMessages.supressDefaultEnv, SWT.CHECK);
- suppressDefaultEnv.setSelection(isSuppressDefaultEnvironmentType());
+ suppressDefaultEnv.setSelection(isSuppressDefaultEnvironment());
data = new GridData();
data.horizontalSpan = 2;
suppressDefaultEnv.setLayoutData(data);
@@ -160,7 +160,7 @@
}
public void widgetSelected(SelectionEvent e) {
- setSuppressDefaultEnvironmentType(suppressDefaultEnv.getSelection());
+ setSuppressDefaultEnvironment(suppressDefaultEnv.getSelection());
markDirty();
}
});
@@ -190,7 +190,7 @@
return "";
}
- protected String getArtifactTypeId() {
+ protected String getArtifactId() {
ArtifactType moduleId = getModuleId(false);
if (moduleId != null
&& moduleId.getArtifactId() != null)
@@ -206,7 +206,7 @@
return "";
}
- protected String getArtifactType() {
+ protected String getArtifact() {
ArtifactType moduleId = getModuleId(false);
if (moduleId != null
&& moduleId.getType() != null)
@@ -215,12 +215,12 @@
}
protected boolean isInverseClassloading() {
- EnvironmentType type = getEnvironmentType(false);
+ EnvironmentType type = getEnvironment(false);
return type != null && type.getInverseClassloading() != null;
}
- protected boolean isSuppressDefaultEnvironmentType() {
- EnvironmentType type = getEnvironmentType(false);
+ protected boolean isSuppressDefaultEnvironment() {
+ EnvironmentType type = getEnvironment(false);
return type != null && type.getSuppressDefaultEnvironment() != null;
}
@@ -234,22 +234,22 @@
protected void setInverseClassloading(boolean enable) {
if (enable) {
- EnvironmentType type = getEnvironmentType(true);
+ EnvironmentType type = getEnvironment(true);
type.setInverseClassloading(getDeploymentObjectFactory().createEmptyType());
} else {
- EnvironmentType type = getEnvironmentType(false);
+ EnvironmentType type = getEnvironment(false);
if (type != null) {
type.setInverseClassloading(null);
}
}
}
- protected void setSuppressDefaultEnvironmentType(boolean enable) {
+ protected void setSuppressDefaultEnvironment(boolean enable) {
if (enable) {
- EnvironmentType type = getEnvironmentType(true);
+ EnvironmentType type = getEnvironment(true);
type.setSuppressDefaultEnvironment(getDeploymentObjectFactory().createEmptyType());
} else {
- EnvironmentType type = getEnvironmentType(false);
+ EnvironmentType type = getEnvironment(false);
if (type != null) {
type.setSuppressDefaultEnvironment(null);
}
@@ -288,7 +288,7 @@
return null;
}
- protected EnvironmentType getEnvironmentType(boolean create) {
+ protected EnvironmentType getEnvironment(boolean create) {
EnvironmentType type = null;
Object plan = getPlan().getValue();
if (WebAppType.class.isInstance(plan)) {
@@ -321,7 +321,7 @@
}
private DependenciesType getDependencies(boolean create) {
- EnvironmentType env = getEnvironmentType(create);
+ EnvironmentType env = getEnvironment(create);
if(env != null) {
DependenciesType dep = env.getDependencies();
if (dep == null && create) {
@@ -334,7 +334,7 @@
}
private ArtifactType getModuleId(boolean create) {
- EnvironmentType type = getEnvironmentType(create);
+ EnvironmentType type = getEnvironment(create);
if (type != null) {
ArtifactType moduleId = type.getModuleId();
if (moduleId == null && create) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java Sun Oct 11 13:27:37 2009
@@ -63,8 +63,8 @@
}
});
- createLabel(composite, CommonMessages.editorWorkDir);
-
+// createLabel(composite, CommonMessages.editorWorkDir);
+//
// workDir = toolkit.createText(composite, plan.getWorkDir(), SWT.BORDER);
// workDir.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
// workDir.addModifyListener(new ModifyListener() {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java Sun Oct 11 13:27:37 2009
@@ -22,7 +22,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v11.ui.sections.AdminObjectSection;
import org.apache.geronimo.xml.ns.j2ee.connector_1.AdminobjectInstanceType;
import org.apache.geronimo.xml.ns.j2ee.connector_1.AdminobjectType;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java Sun Oct 11 13:27:37 2009
@@ -20,7 +20,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
/**
* @version $Rev$ $Date$
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java Sun Oct 11 13:27:37 2009
@@ -20,7 +20,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
/**
* @version $Rev$ $Date$
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java Sun Oct 11 13:27:37 2009
@@ -24,7 +24,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType;
import org.apache.geronimo.xml.ns.j2ee.application_1.ExtModuleType;
import org.apache.geronimo.xml.ns.j2ee.application_1.PathType;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java Sun Oct 11 13:27:37 2009
@@ -22,8 +22,8 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType;
import org.apache.geronimo.xml.ns.naming_1.ObjectFactory;
import org.apache.geronimo.xml.ns.naming_1.PatternType;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java Sun Oct 11 13:27:37 2009
@@ -21,8 +21,8 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.xml.ns.deployment_1.AttributeType;
import org.apache.geronimo.xml.ns.deployment_1.GbeanType;
import org.apache.geronimo.xml.ns.deployment_1.ObjectFactory;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java Sun Oct 11 13:27:37 2009
@@ -24,7 +24,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType;
import org.apache.geronimo.xml.ns.j2ee.application_1.ModuleType;
import org.apache.geronimo.xml.ns.j2ee.application_1.PathType;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java Sun Oct 11 13:27:37 2009
@@ -20,7 +20,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
/**
* @version $Rev$ $Date$
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java Sun Oct 11 13:27:37 2009
@@ -20,7 +20,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
/**
* @version $Rev$ $Date$
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java?rev=824070&r1=824069&r2=824070&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java Sun Oct 11 13:27:37 2009
@@ -22,8 +22,8 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.ui.wizards.AbstractWizard;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.xml.ns.security_1.DistinguishedNameType;
import org.apache.geronimo.xml.ns.security_1.LoginDomainPrincipalType;
import org.apache.geronimo.xml.ns.security_1.PrincipalType;