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 2010/05/20 08:51:27 UTC
svn commit: r946542 [2/4] - in /geronimo/devtools/eclipse-plugin/trunk:
features/org.apache.geronimo.v30.feature/ plugins/
plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/
plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/
plugins/org.apache.geron...
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java?rev=946542&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java Thu May 20 06:51:22 2010
@@ -0,0 +1,150 @@
+/**
+ * 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.jaxbmodel.common.operations;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.geronimo.jaxbmodel.common.internal.Trace;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * <strong>NamespaceFilter</strong> is used to filter out older versions (e.g.,
+ * v1.1) of Geronimo namespaces and replace them with the more current versions
+ * (e.g., v2.1)<p>
+ *
+ * If this class changes, then the test version in org.apache.geronimo.jee.common
+ * need to be updated to be kept in sync
+ *
+ * @version $Rev$ $Date$
+ */
+public class NamespaceFilter extends XMLFilterImpl {
+
+ private static Map<String, String> namespace = new HashMap<String, String>();
+
+ static {
+ //
+ // Convert old deployment namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/deployment",
+ "http://geronimo.apache.org/xml/ns/deployment-1.2");
+ namespace.put("http://geronimo.apache.org/xml/ns/deployment-1.0",
+ "http://geronimo.apache.org/xml/ns/deployment-1.2");
+ namespace.put("http://geronimo.apache.org/xml/ns/deployment-1.1",
+ "http://geronimo.apache.org/xml/ns/deployment-1.2");
+
+ //
+ // Convert old application namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application",
+ "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1",
+ "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
+ "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+
+ //
+ // Convert old application-client namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-client",
+ "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2",
+ "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1",
+ "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+
+ //
+ // Convert old connector namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/connector",
+ "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.0",
+ "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1",
+ "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+
+ //
+ // Convert old web namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web",
+ "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0",
+ "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1",
+ "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2",
+ "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0",
+ "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+
+ //
+ // Convert old naming namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/naming",
+ "http://geronimo.apache.org/xml/ns/naming-1.2");
+ namespace.put("http://geronimo.apache.org/xml/ns/naming-1.0",
+ "http://geronimo.apache.org/xml/ns/naming-1.2");
+ namespace.put("http://geronimo.apache.org/xml/ns/naming-1.1",
+ "http://geronimo.apache.org/xml/ns/naming-1.2");
+
+ //
+ // Convert old security namespaces
+ //
+ namespace.put("http://geronimo.apache.org/xml/ns/security",
+ "http://geronimo.apache.org/xml/ns/security-2.0");
+ namespace.put("http://geronimo.apache.org/xml/ns/security-1.1",
+ "http://geronimo.apache.org/xml/ns/security-2.0");
+ namespace.put("http://geronimo.apache.org/xml/ns/security-1.2",
+ "http://geronimo.apache.org/xml/ns/security-2.0");
+
+ //
+ // Convert old openejb-jar namespaces
+ //
+ namespace.put("http://www.openejb.org/xml/ns/openejb-jar",
+ "http://openejb.apache.org/xml/ns/openejb-jar-2.2");
+ namespace.put("http://www.openejb.org/xml/ns/openejb-jar-2.1",
+ "http://openejb.apache.org/xml/ns/openejb-jar-2.2");
+ namespace.put("http://www.openejb.org/xml/ns/openejb-jar-2.2",
+ "http://openejb.apache.org/xml/ns/openejb-jar-2.2");
+ namespace.put("http://www.openejb.org/xml/ns/openejb-jar-2.3",
+ "http://openejb.apache.org/xml/ns/openejb-jar-2.2");
+ namespace.put("http://www.openejb.org/xml/ns/pkgen",
+ "http://openejb.apache.org/xml/ns/pkgen-2.1");
+ namespace.put("http://www.openejb.org/xml/ns/pkgen-2.0",
+ "http://openejb.apache.org/xml/ns/pkgen-2.1");
+ }
+
+ public NamespaceFilter(XMLReader xmlReader) {
+ super(xmlReader);
+ Trace.tracePoint("Constructor", "NamespaceFilter", xmlReader);
+ }
+
+ public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+ Trace.tracePoint("Entry", "NamespaceFilter.startElement", uri, localName, qname, atts);
+
+ if (namespace.containsKey( uri )) {
+ uri = namespace.get( uri );
+ }
+
+ Trace.tracePoint("Exit ", "NamespaceFilter.startElement", uri, localName, qname, atts);
+ super.startElement(uri, localName, qname, atts);
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java?rev=946542&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java Thu May 20 06:51:22 2010
@@ -0,0 +1,107 @@
+/**
+ * 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.jaxbmodel.common.operations;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class NamespacePrefix extends NamespacePrefixMapper{
+
+ private static Map<String, String> prefixMap = new HashMap<String, String>();
+
+ static {
+ prefixMap.put("http://geronimo.apache.org/xml/ns/deployment-1.2", "dep");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-2.0", "app");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0", "client");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", "conn");
+ prefixMap.put("http://openejb.apache.org/xml/ns/openejb-jar-2.2", "ejb");
+ prefixMap.put("http://java.sun.com/xml/ns/persistence", "pers");
+ prefixMap.put("http://openejb.apache.org/xml/ns/pkgen-2.1", "pkgen");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/naming-1.2", "name");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/security-2.0", "sec");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", "web");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/loginconfig-2.0", "log");
+ }
+
+ public static void processPrefix( Node parent ) {
+ NodeList nl = parent.getChildNodes();
+
+ if ( parent instanceof Element ) {
+ updatePrefix( (Element)parent );
+ }
+
+ for ( int i = 0; i <= nl.getLength(); i ++ ) {
+ Node node = nl.item(i);
+ if ( node instanceof Element ) {
+ processPrefix( node );
+ }
+ }
+
+ }
+
+ private static void updatePrefix( Element element ) {
+ NamedNodeMap mnm = element.getAttributes();
+
+ ArrayList<Attr> attributes = new ArrayList<Attr>();
+ for ( int j = 0; j <= mnm.getLength(); j ++ ) {
+ Attr attr = (Attr)mnm.item(j);
+ if ( attr != null && attr.getOwnerElement() != null && getPrefix( attr.getNodeValue() ) != null ) {
+ attributes.add((Attr)attr.cloneNode(false));
+ }
+ }
+ for ( int j = 0; j < attributes.size(); j ++ ) {
+ Attr tempAttr = attributes.get(j);
+ Attr attr = element.getAttributeNode(tempAttr.getName());
+ Element owner = (Element)attr.getOwnerElement();
+ owner.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" + getPrefix( attr.getNodeValue() ), attr.getNodeValue());
+ owner.removeAttributeNode(attr);
+ }
+ String prefix = getPrefix( element.getNamespaceURI() );
+ if ( prefix != null ) {
+ element.setPrefix( prefix );
+ }
+ }
+
+ private static String getPrefix(String namespaceURI) {
+ if (prefixMap.containsKey(namespaceURI))
+ return prefixMap.get(namespaceURI);
+ return null;
+ }
+
+ @Override
+ public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) {
+
+ if (prefixMap.containsKey(namespaceUri))
+ return prefixMap.get(namespaceUri);
+
+ return suggestion;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespacePrefix.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF Thu May 20 06:51:22 2010
@@ -6,12 +6,14 @@ Bundle-Version: 3.0.0
Bundle-ClassPath: .
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.runtime.common,
- org.eclipse.core.runtime
+Require-Bundle: org.apache.geronimo.jaxbmodel.common,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources
Export-Package: org.apache.geronimo.jee.application,
org.apache.geronimo.jee.applicationclient,
org.apache.geronimo.jee.connector,
org.apache.geronimo.jee.deployment,
+ org.apache.geronimo.jee.jaxbmodel.operations,
org.apache.geronimo.jee.loginconfig,
org.apache.geronimo.jee.naming,
org.apache.geronimo.jee.openejb,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml Thu May 20 06:51:22 2010
@@ -64,6 +64,14 @@
<artifactId>xmlunit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+
+
</dependencies>
<build>
@@ -129,6 +137,10 @@
</plugin>
-->
<plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-eclipsepde-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -166,6 +178,9 @@
<keypass>${keystoreKeypass}</keypass>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Thu May 20 06:51:22 2010
@@ -8,6 +8,7 @@ Bundle-Vendor: Apache Software Foundatio
Bundle-Localization: plugin
Require-Bundle:
org.apache.geronimo.runtime.common;visibility:=reexport,
+ org.apache.geronimo.jaxbmodel.common;visibility:=reexport,
org.eclipse.core.runtime,
org.eclipse.jst.j2ee,
org.eclipse.jst.j2ee.web,
@@ -35,6 +36,5 @@ Export-Package:
org.apache.geronimo.st.core.commands,
org.apache.geronimo.st.core.descriptor,
org.apache.geronimo.st.core.internal,
- org.apache.geronimo.st.core.jaxb,
org.apache.geronimo.st.core.operations
Import-Package: junit.framework;version="3.8.2"
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml Thu May 20 06:51:22 2010
@@ -21,7 +21,6 @@
<plugin>
<extension-point id="sourcePathComputerMapping" name="Geronimo Deployment Plan Loader" schema="schema/sourcePathComputerMapping.exsd"/>
- <extension-point id="JAXBUtilsProvider" name="Geronimo JAXB Utils" schema="schema/JAXBUtilsProvider.exsd"/>
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Thu May 20 06:51:22 2010
@@ -143,15 +143,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.common</artifactId>
<version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.runtime.v22</artifactId>
- <version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
+ <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java Thu May 20 06:51:22 2010
@@ -16,9 +16,9 @@
*/
package org.apache.geronimo.st.core.operations;
+import org.apache.geronimo.jaxbmodel.common.operations.ConversionHelper;
import org.apache.geronimo.st.core.GeronimoUtils;
import org.apache.geronimo.st.core.internal.Trace;
-import org.apache.geronimo.st.core.jaxb.ConversionHelper;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml Thu May 20 06:51:22 2010
@@ -149,5 +149,10 @@
<artifactId>org.apache.geronimo.runtime.common</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/Activator.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/Activator.java Thu May 20 06:51:22 2010
@@ -66,7 +66,6 @@ public class Activator extends AbstractU
public void start(BundleContext context) throws Exception {
super.start(context);
this.setDebugging(true);
- this.setDebugging(true);
}
/*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java Thu May 20 06:51:22 2010
@@ -21,8 +21,8 @@ import java.io.IOException;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
+import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils;
import org.apache.geronimo.st.core.GeronimoUtils;
-import org.apache.geronimo.st.core.jaxb.JAXBUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java Thu May 20 06:51:22 2010
@@ -18,8 +18,8 @@ package org.apache.geronimo.st.ui.wizard
import java.util.List;
-import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
-import org.apache.geronimo.st.core.jaxb.JAXBUtils;
+import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory;
+import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.IWizardPage;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Thu May 20 06:51:22 2010
@@ -8,7 +8,7 @@ Bundle-Vendor: Apache.org
Bundle-Localization: plugin
Require-Bundle: org.apache.geronimo.runtime.v11,
org.apache.geronimo.st.core,
- org.apache.geronimo.j2ee.v11.jaxbmodel;bundle-version="3.0.0",
+ org.apache.geronimo.j2ee.v11.jaxbmodel,
org.eclipse.core.runtime,
org.eclipse.wst.server.core,
org.eclipse.debug.core,
@@ -20,6 +20,5 @@ Require-Bundle: org.apache.geronimo.runt
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.st.v11.core,
org.apache.geronimo.st.v11.core.internal,
- org.apache.geronimo.st.v11.core.jaxb,
org.apache.geronimo.st.v11.core.operations
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml Thu May 20 06:51:22 2010
@@ -110,7 +110,5 @@
</default-facets>
</extension>
- <extension point="org.apache.geronimo.st.core.JAXBUtilsProvider">
- <provider class="org.apache.geronimo.st.v11.core.jaxb.JAXB11Utils" version="1.1"/>
- </extension>
+
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml Thu May 20 06:51:22 2010
@@ -48,7 +48,7 @@
<include>plugin.xml</include>
<include>plugin.properties</include>
<include>.options</include>
- <include>about.ini</include>
+ <include>about.ini</include>
</includes>
</resource>
<!--
@@ -133,22 +133,22 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.st.v21.core</artifactId>
+ <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
+ <artifactId>org.apache.geronimo.runtime.v11</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.runtime.v11</artifactId>
+ <artifactId>org.apache.geronimo.runtime.common</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.runtime.common</artifactId>
+ <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerInfo.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/GeronimoServerInfo.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerInfo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerInfo.java Thu May 20 06:51:22 2010
@@ -31,6 +31,8 @@ import org.apache.geronimo.gbean.Abstrac
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.j2ee.deployment.DependencyType;
+import org.apache.geronimo.j2ee.naming.PatternType;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
@@ -40,8 +42,6 @@ import org.apache.geronimo.kernel.reposi
import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
import org.apache.geronimo.st.v11.core.internal.Trace;
import org.apache.geronimo.system.jmx.KernelDelegate;
-import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
-import org.apache.geronimo.xml.ns.naming_1.PatternType;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -63,7 +63,7 @@ public class GeronimoServerInfo {
private ArrayList<PatternType> jmsDestinations;
private ArrayList<PatternType> jdbcConnectionPools;
private ArrayList<PatternType> javaMailResources;
- private ArrayList<org.apache.geronimo.xml.ns.deployment_1.PatternType> credentialStores;
+ private ArrayList<org.apache.geronimo.j2ee.deployment.PatternType> credentialStores;
private ArrayList<DependencyType> commonLibs;
// singleton class
@@ -100,7 +100,7 @@ public class GeronimoServerInfo {
return javaMailResources;
}
- public ArrayList<org.apache.geronimo.xml.ns.deployment_1.PatternType> getDeployedCredentialStores() {
+ public ArrayList<org.apache.geronimo.j2ee.deployment.PatternType> getDeployedCredentialStores() {
return credentialStores;
}
@@ -211,7 +211,7 @@ public class GeronimoServerInfo {
}
private void updateDeployedCredentialStores() {
- credentialStores = new ArrayList<org.apache.geronimo.xml.ns.deployment_1.PatternType>();
+ credentialStores = new ArrayList<org.apache.geronimo.j2ee.deployment.PatternType>();
Map map = Collections.singletonMap("j2eeType", "GBean");
AbstractNameQuery query = new AbstractNameQuery(null, map,
Collections.EMPTY_SET);
@@ -226,7 +226,7 @@ public class GeronimoServerInfo {
if (attribInfo != null) {
Artifact artifact = abstractName.getArtifact();
Object name = abstractName.getName().get("name");
- org.apache.geronimo.xml.ns.deployment_1.PatternType pattern = new org.apache.geronimo.xml.ns.deployment_1.PatternType();
+ org.apache.geronimo.j2ee.deployment.PatternType pattern = new org.apache.geronimo.j2ee.deployment.PatternType();
pattern.setArtifactId(artifact.getArtifactId());
pattern.setGroupId(artifact.getGroupId());
pattern.setType(artifact.getType());
@@ -395,9 +395,9 @@ public class GeronimoServerInfo {
}
protected void printDeploymentPatternList(
- List<org.apache.geronimo.xml.ns.deployment_1.PatternType> patternList) {
+ List<org.apache.geronimo.j2ee.deployment.PatternType> patternList) {
for (int i = 0; i < patternList.size(); i++) {
- org.apache.geronimo.xml.ns.deployment_1.PatternType pattern = patternList
+ org.apache.geronimo.j2ee.deployment.PatternType pattern = patternList
.get(i);
System.out.println("ArtifactID:" + pattern.getArtifactId()
+ " GroupID:" + pattern.getGroupId() + " Module:"
@@ -436,7 +436,7 @@ public class GeronimoServerInfo {
List<PatternType> javaMailResources = getJavaMailSessions();
printNamingPatternList(javaMailResources);
System.out.println("\n\nCredential Stores: \n");
- List<org.apache.geronimo.xml.ns.deployment_1.PatternType> credentialStores = getDeployedCredentialStores();
+ List<org.apache.geronimo.j2ee.deployment.PatternType> credentialStores = getDeployedCredentialStores();
printDeploymentPatternList(credentialStores);
System.out.println("\n\nCommon Libs: \n");
List<DependencyType> dependencies = getCommonLibs();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoV11Utils.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/GeronimoV11Utils.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java Thu May 20 06:51:22 2010
@@ -18,18 +18,18 @@ package org.apache.geronimo.st.v11.core;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.application.ApplicationType;
+import org.apache.geronimo.j2ee.connector.ConnectorType;
+import org.apache.geronimo.j2ee.deployment.ArtifactType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
+import org.apache.geronimo.j2ee.web.WebAppType;
+import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils;
import org.apache.geronimo.st.core.GeronimoUtils;
import org.apache.geronimo.st.core.internal.Trace;
-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.EnvironmentType;
-import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType;
-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.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
/**
* @version $Rev: 471551 $ $Date: 2006-11-05 17:47:11 -0500 (Sun, 05 Nov 2006) $
Modified: 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=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java Thu May 20 06:51:22 2010
@@ -24,24 +24,24 @@ import java.util.Set;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.application.ApplicationType;
+import org.apache.geronimo.j2ee.applicationclient.ApplicationClientType;
+import org.apache.geronimo.j2ee.connector.ConnectorType;
+import org.apache.geronimo.j2ee.deployment.ArtifactType;
+import org.apache.geronimo.j2ee.deployment.DependenciesType;
+import org.apache.geronimo.j2ee.deployment.DependencyType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.ObjectFactory;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
+import org.apache.geronimo.j2ee.web.WebAppType;
+import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils;
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
Modified: 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=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyManager.java Thu May 20 06:51:22 2010
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+import org.apache.geronimo.j2ee.deployment.ArtifactType;
/**
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=946542&r1=946541&r2=946542&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 Thu May 20 06:51:22 2010
@@ -18,23 +18,23 @@ package org.apache.geronimo.st.v11.core.
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.application.ApplicationType;
+import org.apache.geronimo.j2ee.application.ObjectFactory;
+import org.apache.geronimo.j2ee.applicationclient.ApplicationClientType;
+import org.apache.geronimo.j2ee.connector.ResourceadapterType;
+import org.apache.geronimo.j2ee.deployment.ArtifactType;
+import org.apache.geronimo.j2ee.deployment.DependenciesType;
+import org.apache.geronimo.j2ee.deployment.DependencyType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.ServiceType;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
+import org.apache.geronimo.j2ee.web.WebAppType;
+import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils;
import org.apache.geronimo.st.core.DeploymentPlanInstallConfig;
import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
import org.apache.geronimo.st.v11.core.internal.Trace;
-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.ServiceType;
-import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType;
-import org.apache.geronimo.xml.ns.j2ee.application_1.ObjectFactory;
-import org.apache.geronimo.xml.ns.j2ee.application_client_1.ApplicationClientType;
-import org.apache.geronimo.xml.ns.j2ee.connector_1.ResourceadapterType;
-import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType;
import org.eclipse.core.resources.IFile;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
/**
* @version $Rev: 509704 $ $Date: 2007-02-20 13:42:24 -0500 (Tue, 20 Feb 2007) $
@@ -80,7 +80,7 @@ public class V11DeploymentPlanCreationOp
Trace.tracePoint("Entry", "V11DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
dpFile, dpFile.getFullPath());
- org.apache.geronimo.xml.ns.j2ee.web_1.ObjectFactory webFactory = new org.apache.geronimo.xml.ns.j2ee.web_1.ObjectFactory();
+ org.apache.geronimo.j2ee.web.ObjectFactory webFactory = new org.apache.geronimo.j2ee.web.ObjectFactory();
WebAppType web = webFactory.createWebAppType();
web.setContextRoot("/" + getProject().getName());
@@ -102,7 +102,7 @@ public class V11DeploymentPlanCreationOp
public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) throws Exception {
Trace.tracePoint("Entry", "V11DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
- org.openejb.xml.ns.openejb_jar_2.ObjectFactory ejbFactory = new org.openejb.xml.ns.openejb_jar_2.ObjectFactory();
+ org.apache.geronimo.j2ee.openejb_jar.ObjectFactory ejbFactory = new org.apache.geronimo.j2ee.openejb_jar.ObjectFactory();
OpenejbJarType ejbJar = ejbFactory.createOpenejbJarType();
ejbJar.setEnvironment(getConfigEnvironment());
@@ -122,8 +122,8 @@ public class V11DeploymentPlanCreationOp
public JAXBElement createConnectorDeploymentPlan(IFile dpFile) throws Exception {
Trace.tracePoint("Entry", "V11DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
- org.apache.geronimo.xml.ns.j2ee.connector_1.ObjectFactory connectorFactory = new org.apache.geronimo.xml.ns.j2ee.connector_1.ObjectFactory();
- org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType connector = connectorFactory.createConnectorType();
+ org.apache.geronimo.j2ee.connector.ObjectFactory connectorFactory = new org.apache.geronimo.j2ee.connector.ObjectFactory();
+ org.apache.geronimo.j2ee.connector.ConnectorType connector = connectorFactory.createConnectorType();
ResourceadapterType resourceadapter = connectorFactory.createResourceadapterType();
connector.setEnvironment(getConfigEnvironment());
@@ -139,7 +139,7 @@ public class V11DeploymentPlanCreationOp
public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile dpFile) throws Exception {
Trace.tracePoint("Entry","V11DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", dpFile);
- org.apache.geronimo.xml.ns.j2ee.application_client_1.ObjectFactory applicationClientFactory = new org.apache.geronimo.xml.ns.j2ee.application_client_1.ObjectFactory();
+ org.apache.geronimo.j2ee.applicationclient.ObjectFactory applicationClientFactory = new org.apache.geronimo.j2ee.applicationclient.ObjectFactory();
ApplicationClientType applicationClient = applicationClientFactory.createApplicationClientType();
applicationClient.setServerEnvironment(getConfigEnvironment());
@@ -155,7 +155,7 @@ public class V11DeploymentPlanCreationOp
public JAXBElement createServiceDeploymentPlan(IFile dpFile) throws Exception {
Trace.tracePoint("Entry","V11DeploymentPlanCreationOperation.createServiceDeploymentPlan", dpFile);
- org.apache.geronimo.xml.ns.deployment_1.ObjectFactory artifactFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+ org.apache.geronimo.j2ee.deployment.ObjectFactory artifactFactory = new org.apache.geronimo.j2ee.deployment.ObjectFactory();
ServiceType service = artifactFactory.createServiceType();
@@ -183,7 +183,7 @@ public class V11DeploymentPlanCreationOp
: "car";
ArtifactType artifact = createArtifact(groupId, artifactId, version, type);
- org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+ org.apache.geronimo.j2ee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.j2ee.deployment.ObjectFactory();
EnvironmentType env = serviceFactory.createEnvironmentType();
env.setModuleId(artifact);
@@ -206,7 +206,7 @@ public class V11DeploymentPlanCreationOp
public static ArtifactType createArtifact(String groupId, String artifactId, String version, String type) {
Trace.tracePoint("Entry", "V11DeploymentPlanCreationOperation.createArtifact", groupId, artifactId, version, type);
- org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+ org.apache.geronimo.j2ee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.j2ee.deployment.ObjectFactory();
ArtifactType artifact = serviceFactory.createArtifactType();
if (groupId != null)
@@ -224,7 +224,7 @@ public class V11DeploymentPlanCreationOp
public static DependencyType createDependency(String groupId, String artifactId, String version, String type) {
Trace.tracePoint("Entry", "V11DeploymentPlanCreationOperation.createDependency", groupId, artifactId, version, type);
- org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+ org.apache.geronimo.j2ee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.j2ee.deployment.ObjectFactory();
DependencyType dependency = serviceFactory.createDependencyType();
if (groupId != null)
dependency.setGroupId(groupId);
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=946542&r1=946541&r2=946542&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 Thu May 20 06:51:22 2010
@@ -23,4 +23,3 @@ Require-Bundle: org.apache.geronimo.runt
org.eclipse.wst.sse.ui,
org.eclipse.jface.text;bundle-version="3.5.0"
Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.geronimo.st.v11.core.jaxb
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml Thu May 20 06:51:22 2010
@@ -145,22 +145,17 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.st.v21.core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.ui</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.st.v21.ui</artifactId>
+ <artifactId>org.apache.geronimo.runtime.v11</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.runtime.v11</artifactId>
+ <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
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=946542&r1=946541&r2=946542&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 Thu May 20 06:51:22 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v11.ui.ed
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.st.core.jaxb.JAXBUtils;
+import org.apache.geronimo.jaxbmodel.common.operations.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/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=946542&r1=946541&r2=946542&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 Thu May 20 06:51:22 2010
@@ -16,20 +16,20 @@
*/
package org.apache.geronimo.st.v11.ui.pages;
+import org.apache.geronimo.j2ee.application.ApplicationType;
+import org.apache.geronimo.j2ee.applicationclient.ApplicationClientType;
+import org.apache.geronimo.j2ee.connector.ConnectorType;
+import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils;
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.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;
import org.apache.geronimo.st.v11.ui.sections.DependencySection;
import org.apache.geronimo.st.v11.ui.sections.ExtModuleSection;
import org.apache.geronimo.st.v11.ui.sections.GBeanSection;
import org.apache.geronimo.st.v11.ui.sections.ModuleSection;
-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.eclipse.swt.layout.GridLayout;
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/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=946542&r1=946541&r2=946542&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 Thu May 20 06:51:22 2010
@@ -16,6 +16,9 @@
*/
package org.apache.geronimo.st.v11.ui.pages;
+import org.apache.geronimo.j2ee.applicationclient.ApplicationClientType;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
+import org.apache.geronimo.j2ee.web.WebAppType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
@@ -28,12 +31,9 @@ import org.apache.geronimo.st.v11.ui.sec
import org.apache.geronimo.st.v11.ui.sections.ResourceEnvRefSection;
import org.apache.geronimo.st.v11.ui.sections.ResourceRefSection;
import org.apache.geronimo.st.v11.ui.sections.ServiceRefSection;
-import org.apache.geronimo.xml.ns.j2ee.application_client_1.ApplicationClientType;
-import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
-import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
/**
* @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/sections/AdminObjectSection.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/AdminObjectSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java Thu May 20 06:51:22 2010
@@ -20,13 +20,13 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.connector.AdminobjectInstanceType;
+import org.apache.geronimo.j2ee.connector.AdminobjectType;
+import org.apache.geronimo.j2ee.connector.ConfigPropertySettingType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.AdminObjectWizard;
-import org.apache.geronimo.xml.ns.j2ee.connector_1.AdminobjectInstanceType;
-import org.apache.geronimo.xml.ns.j2ee.connector_1.AdminobjectType;
-import org.apache.geronimo.xml.ns.j2ee.connector_1.ConfigPropertySettingType;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppClientClientGeneralSection.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/AppClientClientGeneralSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppClientClientGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppClientClientGeneralSection.java Thu May 20 06:51:22 2010
@@ -18,9 +18,9 @@ package org.apache.geronimo.st.v11.ui.se
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.applicationclient.ApplicationClientType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
-import org.apache.geronimo.xml.ns.j2ee.application_client_1.ApplicationClientType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppClientServerGeneralSection.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/AppClientServerGeneralSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppClientServerGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppClientServerGeneralSection.java Thu May 20 06:51:22 2010
@@ -18,9 +18,9 @@ package org.apache.geronimo.st.v11.ui.se
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.applicationclient.ApplicationClientType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
-import org.apache.geronimo.xml.ns.j2ee.application_client_1.ApplicationClientType;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppGeneralSection.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/AppGeneralSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AppGeneralSection.java Thu May 20 06:51:22 2010
@@ -18,8 +18,8 @@ package org.apache.geronimo.st.v11.ui.se
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.application.ApplicationType;
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ClassFilterSection.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/ClassFilterSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ClassFilterSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ClassFilterSection.java Thu May 20 06:51:22 2010
@@ -20,13 +20,13 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.deployment.ClassFilterType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
+import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.ClassFilterWizard;
-import org.apache.geronimo.xml.ns.deployment_1.ClassFilterType;
-import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
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=946542&r1=946541&r2=946542&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 Thu May 20 06:51:22 2010
@@ -21,16 +21,17 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.xml.ns.deployment_1.ObjectFactory;
+import org.apache.geronimo.j2ee.application.ApplicationType;
+import org.apache.geronimo.j2ee.connector.ConnectorType;
+import org.apache.geronimo.j2ee.deployment.ArtifactType;
+import org.apache.geronimo.j2ee.deployment.DependenciesType;
+import org.apache.geronimo.j2ee.deployment.DependencyType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.ObjectFactory;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
+import org.apache.geronimo.j2ee.web.WebAppType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-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.j2ee.application_1.ApplicationType;
-import org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType;
-import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -43,7 +44,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
/**
* @version $Rev$ $Date$
@@ -346,9 +346,9 @@ public abstract class CommonGeneralSecti
return null;
}
- protected org.apache.geronimo.xml.ns.deployment_1.ObjectFactory getDeploymentObjectFactory() {
+ protected org.apache.geronimo.j2ee.deployment.ObjectFactory getDeploymentObjectFactory() {
if ( deploymentObjectFactory == null ) {
- deploymentObjectFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+ deploymentObjectFactory = new org.apache.geronimo.j2ee.deployment.ObjectFactory();
}
return deploymentObjectFactory;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ConnectorGeneralSection.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/ConnectorGeneralSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ConnectorGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ConnectorGeneralSection.java Thu May 20 06:51:22 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v11.ui.se
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType;
+import org.apache.geronimo.j2ee.connector.ConnectorType;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/DependencySection.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/DependencySection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/DependencySection.java Thu May 20 06:51:22 2010
@@ -20,13 +20,13 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.deployment.DependenciesType;
+import org.apache.geronimo.j2ee.deployment.DependencyType;
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.DependencyWizard;
-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.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbLocalRefSection.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/EjbLocalRefSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbLocalRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbLocalRefSection.java Thu May 20 06:51:22 2010
@@ -20,11 +20,11 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.naming.EjbLocalRefType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.EjbLocalRefWizard;
-import org.apache.geronimo.xml.ns.naming_1.EjbLocalRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRefSection.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/EjbRefSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRefSection.java Thu May 20 06:51:22 2010
@@ -20,11 +20,11 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.naming.EjbRefType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.EjbRefWizard;
-import org.apache.geronimo.xml.ns.naming_1.EjbRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.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/EjbRelationSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java Thu May 20 06:51:22 2010
@@ -20,6 +20,9 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.openejb_jar.EjbRelationType;
+import org.apache.geronimo.j2ee.openejb_jar.EjbRelationshipRoleType;
+import org.apache.geronimo.j2ee.openejb_jar.RelationshipsType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v11.ui.Activator;
@@ -30,9 +33,6 @@ import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.openejb.xml.ns.openejb_jar_2.EjbRelationType;
-import org.openejb.xml.ns.openejb_jar_2.EjbRelationshipRoleType;
-import org.openejb.xml.ns.openejb_jar_2.RelationshipsType;
/**
* @version $Rev: 705002 $ $Date: 2008-10-16 03:34:27 +0800 (Thu, 16 Oct 2008) $
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.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/ExtModuleSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java Thu May 20 06:51:22 2010
@@ -20,10 +20,10 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.application.ExtModuleType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.wizards.ExtModuleWizard;
-import org.apache.geronimo.xml.ns.j2ee.application_1.ExtModuleType;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.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/GBeanRefSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java Thu May 20 06:51:22 2010
@@ -21,13 +21,13 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.deployment.PatternType;
+import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils;
+import org.apache.geronimo.j2ee.naming.GbeanRefType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
-import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.GBeanRefWizard;
-import org.apache.geronimo.xml.ns.deployment_1.PatternType;
-import org.apache.geronimo.xml.ns.naming_1.GbeanRefType;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.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/GBeanSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java Thu May 20 06:51:22 2010
@@ -20,14 +20,14 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.deployment.AttributeType;
+import org.apache.geronimo.j2ee.deployment.GbeanType;
+import org.apache.geronimo.j2ee.deployment.PatternType;
+import org.apache.geronimo.j2ee.deployment.ReferenceType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.GBeanWizard;
-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.PatternType;
-import org.apache.geronimo.xml.ns.deployment_1.ReferenceType;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/MessageDestSection.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/MessageDestSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/MessageDestSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/MessageDestSection.java Thu May 20 06:51:22 2010
@@ -20,10 +20,10 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.naming.MessageDestinationType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.wizards.MessageDestWizard;
-import org.apache.geronimo.xml.ns.naming_1.MessageDestinationType;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.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/ModuleSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java Thu May 20 06:51:22 2010
@@ -20,10 +20,10 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.application.ModuleType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.wizards.ModuleWizard;
-import org.apache.geronimo.xml.ns.j2ee.application_1.ModuleType;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/OpenEjbJarCMPSection.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/OpenEjbJarCMPSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/OpenEjbJarCMPSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/OpenEjbJarCMPSection.java Thu May 20 06:51:22 2010
@@ -18,12 +18,13 @@ package org.apache.geronimo.st.v11.ui.se
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.naming.ObjectFactory;
+import org.apache.geronimo.j2ee.naming.PatternType;
+import org.apache.geronimo.j2ee.naming.ResourceLocatorType;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.internal.Messages;
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-import org.apache.geronimo.xml.ns.naming_1.ObjectFactory;
-import org.apache.geronimo.xml.ns.naming_1.PatternType;
-import org.apache.geronimo.xml.ns.naming_1.ResourceLocatorType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -36,7 +37,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
/**
* @version $Rev: 700249 $ $Date: 2008-09-30 04:50:12 +0800 (Tue, 30 Sep 2008) $
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/OpenEjbJarGeneralSection.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/OpenEjbJarGeneralSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/OpenEjbJarGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/OpenEjbJarGeneralSection.java Thu May 20 06:51:22 2010
@@ -18,6 +18,8 @@ package org.apache.geronimo.st.v11.ui.se
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.openejb_jar.ObjectFactory;
+import org.apache.geronimo.j2ee.openejb_jar.OpenejbJarType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -29,8 +31,6 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.openejb.xml.ns.openejb_jar_2.ObjectFactory;
-import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
/**
* @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/sections/ResourceEnvRefSection.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/ResourceEnvRefSection.java?rev=946542&r1=946541&r2=946542&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ResourceEnvRefSection.java Thu May 20 06:51:22 2010
@@ -20,11 +20,11 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.j2ee.naming.ResourceEnvRefType;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v11.ui.Activator;
import org.apache.geronimo.st.v11.ui.wizards.ResourceEnvRefWizard;
-import org.apache.geronimo.xml.ns.naming_1.ResourceEnvRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;