geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shiv...@apache.org
Subject svn commit: r636971 [1/2] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.runtime.common/ org.apache.geronimo.runtime.common/META-INF/ org.apache.geronimo.runtime.v11/ org.apache.geronimo.runtime.v11/META-INF/ org.apache.geron...
Date Fri, 14 Mar 2008 02:57:57 GMT
Author: shivahr
Date: Thu Mar 13 19:57:55 2008
New Revision: 636971

URL: http://svn.apache.org/viewvc?rev=636971&view=rev
Log:
GERONIMODEVTOOLS-295 Delete redundant dependencies from runtime plug-ins - Make GEP thinner!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11VersionHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoRuntime.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20VersionHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoRuntime.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21VersionHandler.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Thu Mar 13 19:57:55 2008
@@ -9,7 +9,6 @@
  lib/stax-api-1.0.jar,
  lib/cglib-nodep-2.1_3.jar,
  lib/xstream-1.2.2.jar,
- lib/xmlbeans-2.3.0.jar,
  lib/xpp3-1.1.3.3.jar,
  lib/jaxb-api-2.1.jar,
  lib/jaxb-impl-2.1.3.jar,
@@ -93,52 +92,6 @@
  net.sf.cglib.util,
  org.apache.commons.logging,
  org.apache.commons.logging.impl,
- org.apache.xmlbeans,
- org.apache.xmlbeans.impl.common,
- org.apache.xmlbeans.impl.config,
- org.apache.xmlbeans.impl.inst2xsd,
- org.apache.xmlbeans.impl.inst2xsd.util,
- org.apache.xmlbeans.impl.jam,
- org.apache.xmlbeans.impl.jam.annotation,
- org.apache.xmlbeans.impl.jam.internal,
- org.apache.xmlbeans.impl.jam.internal.classrefs,
- org.apache.xmlbeans.impl.jam.internal.elements,
- org.apache.xmlbeans.impl.jam.internal.javadoc,
- org.apache.xmlbeans.impl.jam.internal.parser,
- org.apache.xmlbeans.impl.jam.internal.reflect,
- org.apache.xmlbeans.impl.jam.mutable,
- org.apache.xmlbeans.impl.jam.provider,
- org.apache.xmlbeans.impl.jam.visitor,
- org.apache.xmlbeans.impl.jam.xml,
- org.apache.xmlbeans.impl.piccolo.io,
- org.apache.xmlbeans.impl.piccolo.util,
- org.apache.xmlbeans.impl.piccolo.xml,
- org.apache.xmlbeans.impl.regex,
- org.apache.xmlbeans.impl.richParser,
- org.apache.xmlbeans.impl.schema,
- org.apache.xmlbeans.impl.soap,
- org.apache.xmlbeans.impl.store,
- org.apache.xmlbeans.impl.tool,
- org.apache.xmlbeans.impl.util,
- org.apache.xmlbeans.impl.validator,
- org.apache.xmlbeans.impl.values,
- org.apache.xmlbeans.impl.xb.ltgfmt,
- org.apache.xmlbeans.impl.xb.ltgfmt.impl,
- org.apache.xmlbeans.impl.xb.substwsdl,
- org.apache.xmlbeans.impl.xb.substwsdl.impl,
- org.apache.xmlbeans.impl.xb.xmlconfig,
- org.apache.xmlbeans.impl.xb.xmlconfig.impl,
- org.apache.xmlbeans.impl.xb.xmlschema,
- org.apache.xmlbeans.impl.xb.xmlschema.impl,
- org.apache.xmlbeans.impl.xb.xsdownload,
- org.apache.xmlbeans.impl.xb.xsdownload.impl,
- org.apache.xmlbeans.impl.xb.xsdschema,
- org.apache.xmlbeans.impl.xb.xsdschema.impl,
- org.apache.xmlbeans.impl.xsd2inst,
- org.apache.xmlbeans.soap,
- org.apache.xmlbeans.xml.stream,
- org.apache.xmlbeans.xml.stream.events,
- org.apache.xmlbeans.xml.stream.utils,
  org.xmlpull.mxp1,
  org.xmlpull.mxp1_serializer,
  org.xmlpull.v1,
@@ -148,86 +101,5 @@
  org.xmlpull.v1.sax2,
  org.xmlpull.v1.util,
  org.xmlpull.v1.wrapper,
- org.xmlpull.v1.wrapper.classic,
- repackage,
- schemaorg_apache_xmlbeans.attribute.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.attributegroup.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001_2FXMLSchema,
- schemaorg_apache_xmlbeans.attributegroup.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_0072531D5C2BA64B5A3672B694CDAA153CD30788,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_5AAF5BEFD4F30D215E94ED53118FE32C537C3B26,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fwww_2Ebea_2Ecom_2F2003_2F01_2Fxmlbean_2Fxsdownload,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fwww_2Ebea_2Ecom_2F2003_2F05_2Fxmlbean_2Fltgfmt,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001_2FXMLSchema,
- schemaorg_apache_xmlbeans.identityconstraint.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001_2FXMLSchema,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.ltgfmt,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.ltgfmt.FileDesc,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.ltgfmt.TestCase,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.ltgfmt.TestsDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.substwsdl,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig.ConfigDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig.JavaNameList,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig.NamespaceList,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig.NamespaceList.Member2,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlconfig.NamespaceList.Member2.Item,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlschema,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xmlschema.SpaceAttribute,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdownload,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdownload.DownloadedSchemasDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.All,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.AllNNI,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.AnnotationDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.AnyDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.AppinfoDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.Attribute,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.BlockSet,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.BlockSet.Member2,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.ComplexContentDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.DerivationSet,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.DocumentationDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.FieldDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.FieldDocument.Field,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.ImportDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.KeyrefDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.ListDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.NamedGroup,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.NamespaceList,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.NamespaceList.Member2,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.NamespaceList.Member2.Item,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.NotationDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.PatternDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.RedefineDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.SelectorDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.SelectorDocument.Selector,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.SimpleContentDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.SimpleDerivationSet,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.TotalDigitsDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.UnionDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.UnionDocument.Union,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.WhiteSpaceDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.WhiteSpaceDocument.WhiteSpace,
- schemaorg_apache_xmlbeans.javaname.org.apache.xmlbeans.impl.xb.xsdschema.Wildcard,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001_2FXMLSchema,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_0072531D5C2BA64B5A3672B694CDAA153CD30788,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_5AAF5BEFD4F30D215E94ED53118FE32C537C3B26,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ebea_2Ecom_2F2003_2F01_2Fxmlbean_2Fxsdownload,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ebea_2Ecom_2F2003_2F05_2Fxmlbean_2Fltgfmt,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001_2FXMLSchema,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.src,
- schemaorg_apache_xmlbeans.system.sXMLCONFIG,
- schemaorg_apache_xmlbeans.system.sXMLLANG,
- schemaorg_apache_xmlbeans.system.sXMLSCHEMA,
- schemaorg_apache_xmlbeans.system.sXMLTOOLS,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_0072531D5C2BA64B5A3672B694CDAA153CD30788,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_5AAF5BEFD4F30D215E94ED53118FE32C537C3B26,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fwww_2Ebea_2Ecom_2F2003_2F01_2Fxmlbean_2Fxsdownload,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fwww_2Ebea_2Ecom_2F2003_2F05_2Fxmlbean_2Fltgfmt,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001_2FXMLSchema
+ org.xmlpull.v1.wrapper.classic
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Thu Mar 13 19:57:55 2008
@@ -96,10 +96,6 @@
                                     <artifactId>xpp3</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.xmlbeans</groupId>
-                                    <artifactId>xmlbeans</artifactId>
-                                </artifactItem>
-                                <artifactItem>
                                     <groupId>javax.xml.bind</groupId>
                                     <artifactId>jaxb-api</artifactId>
                                     <version>2.1</version>
@@ -178,10 +174,6 @@
         <dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF Thu Mar 13 19:57:55 2008
@@ -4,28 +4,16 @@
 Bundle-SymbolicName: org.apache.geronimo.runtime.v11;singleton:=true
 Bundle-Version: 2.1.0
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/openejb-builder-2.1.1.jar,
- lib/geronimo-web-builder-1.1.1.jar,
- lib/geronimo-util-1.1.1.jar,
+Bundle-ClassPath: lib/geronimo-util-1.1.1.jar,
  lib/geronimo-system-1.1.1.jar,
- lib/geronimo-service-builder-1.1.1.jar,
- lib/geronimo-security-builder-1.1.1.jar,
- lib/geronimo-naming-builder-1.1.1.jar,
  lib/geronimo-kernel-1.1.1.jar,
  lib/geronimo-j2ee-schema-1.1.1.jar,
- lib/geronimo-j2ee-builder-1.1.1.jar,
  lib/geronimo-deployment-1.1.1.jar,
  lib/geronimo-deploy-jsr88-1.1.1.jar,
- lib/geronimo-connector-builder-1.1.1.jar,
  lib/geronimo-common-1.1.1.jar
 Export-Package: org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
- org.apache.geronimo.connector.deployment,
- org.apache.geronimo.connector.deployment.dconfigbean,
- org.apache.geronimo.connector.deployment.jsr88,
  org.apache.geronimo.deployment,
- org.apache.geronimo.deployment.javabean.xbeans,
- org.apache.geronimo.deployment.javabean.xbeans.impl,
  org.apache.geronimo.deployment.plugin,
  org.apache.geronimo.deployment.plugin.application,
  org.apache.geronimo.deployment.plugin.client,
@@ -33,17 +21,10 @@
  org.apache.geronimo.deployment.plugin.jmx,
  org.apache.geronimo.deployment.plugin.local,
  org.apache.geronimo.deployment.plugin.remote,
- org.apache.geronimo.deployment.service,
- org.apache.geronimo.deployment.service.jsr88,
  org.apache.geronimo.deployment.util,
- org.apache.geronimo.deployment.xbeans,
- org.apache.geronimo.deployment.xbeans.impl,
  org.apache.geronimo.deployment.xml,
- org.apache.geronimo.deployment.xmlbeans,
  org.apache.geronimo.gbean,
  org.apache.geronimo.gbean.runtime,
- org.apache.geronimo.j2ee,
- org.apache.geronimo.j2ee.deployment,
  org.apache.geronimo.kernel,
  org.apache.geronimo.kernel.basic,
  org.apache.geronimo.kernel.classloader,
@@ -55,10 +36,7 @@
  org.apache.geronimo.kernel.proxy,
  org.apache.geronimo.kernel.repository,
  org.apache.geronimo.kernel.util,
- org.apache.geronimo.naming.deployment,
- org.apache.geronimo.naming.deployment.jsr88,
  org.apache.geronimo.schema,
- org.apache.geronimo.security.deployment,
  org.apache.geronimo.system.configuration,
  org.apache.geronimo.system.configuration.cli,
  org.apache.geronimo.system.jmx,
@@ -89,113 +67,5 @@
  org.apache.geronimo.util.encoders,
  org.apache.geronimo.util.jce,
  org.apache.geronimo.util.jce.interfaces,
- org.apache.geronimo.util.jce.provider,
- org.apache.geronimo.web.deployment,
- org.apache.geronimo.xbeans.geronimo,
- org.apache.geronimo.xbeans.geronimo.impl,
- org.apache.geronimo.xbeans.geronimo.j2ee,
- org.apache.geronimo.xbeans.geronimo.j2ee.impl,
- org.apache.geronimo.xbeans.geronimo.loginconfig,
- org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
- org.apache.geronimo.xbeans.geronimo.naming,
- org.apache.geronimo.xbeans.geronimo.naming.impl,
- org.apache.geronimo.xbeans.geronimo.security,
- org.apache.geronimo.xbeans.geronimo.security.impl,
- org.apache.geronimo.xbeans.geronimo.web,
- org.apache.geronimo.xbeans.geronimo.web.impl,
- org.openejb.corba.security.config.css,
- org.openejb.corba.security.config.tss,
- org.openejb.deployment,
- org.openejb.deployment.ant,
- org.openejb.deployment.corba,
- org.openejb.transaction,
- org.openejb.xbeans.csiv2.css,
- org.openejb.xbeans.csiv2.css.impl,
- org.openejb.xbeans.csiv2.tss,
- org.openejb.xbeans.csiv2.tss.impl,
- org.openejb.xbeans.ejbjar,
- org.openejb.xbeans.ejbjar.impl,
- org.w3.xml.x1998.namespace,
- org.w3.xml.x1998.namespace.impl,
- schemaorg_apache_xmlbeans.attribute.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.attributegroup.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_02483D38844388463B74BE7AE0EF65015157E4C4,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_2267EB7D9E516602C6C8570149D294E8897A2838,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_6A5B40E194E67E5DF4E1B38ABB86ED81D8A8AC02,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_D0F23FECA6787FBF9C4BF3D18DEE677DB8880200,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_E566B4774FD5CE964CB8E11E4BDA9C84DF3C3908,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E1,
- schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
- schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_E566B4774FD5CE964CB8E11E4BDA9C84DF3C3908,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.javabean.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.j2ee,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.loginconfig,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.naming,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.web,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css.CSSCssType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css.CSSSECIOPType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css.CSSSSLType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSSECIOPType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSSSLType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSSasMechType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSTssType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEjbRelationshipRoleType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEjbRelationshipRoleType.RoleMapping,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEntityBeanType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEntityBeanType.Cache,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbGroupType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbQueryType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbQueryType.QueryMethod,
- schemaorg_apache_xmlbeans.javaname.org.w3.xml.x1998.namespace,
- schemaorg_apache_xmlbeans.javaname.org.w3.xml.x1998.namespace.LangAttribute,
- schemaorg_apache_xmlbeans.javaname.org.w3.xml.x1998.namespace.LangAttribute.Lang,
- schemaorg_apache_xmlbeans.javaname.org.w3.xml.x1998.namespace.SpaceAttribute,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E1,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_02483D38844388463B74BE7AE0EF65015157E4C4,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_2267EB7D9E516602C6C8570149D294E8897A2838,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_6A5B40E194E67E5DF4E1B38ABB86ED81D8A8AC02,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_D0F23FECA6787FBF9C4BF3D18DEE677DB8880200,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_E566B4774FD5CE964CB8E11E4BDA9C84DF3C3908,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E1,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.src.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001,
- schemaorg_apache_xmlbeans.src.modules,
- schemaorg_apache_xmlbeans.system.s624ECD384556376FBF6D19CFF950A0F4,
- schemaorg_apache_xmlbeans.system.s686B996523AFA8A7C9F05CB07BC216B9,
- schemaorg_apache_xmlbeans.system.sC0CFD54C10B8C0292B30704501EF82FF,
- schemaorg_apache_xmlbeans.system.sCE8F1FAA1161B911F2297F6EBF4F2D37,
- schemaorg_apache_xmlbeans.system.sD110B3BA6E7C77F9DEDB8E0BF29A3FA7,
- schemaorg_apache_xmlbeans.system.sD54265BC20BB40986932114D35E4E1A4,
- schemaorg_apache_xmlbeans.system.sD81E1984D3B5AFD019AC1E421CD645AD,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_02483D38844388463B74BE7AE0EF65015157E4C4,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_2267EB7D9E516602C6C8570149D294E8897A2838,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_6A5B40E194E67E5DF4E1B38ABB86ED81D8A8AC02,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_D0F23FECA6787FBF9C4BF3D18DEE677DB8880200,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_E566B4774FD5CE964CB8E11E4BDA9C84DF3C3908,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E1
+ org.apache.geronimo.util.jce.provider
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml Thu Mar 13 19:57:55 2008
@@ -96,41 +96,6 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>geronimo</groupId>
-                                    <artifactId>geronimo-service-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>geronimo</groupId>
-                                    <artifactId>geronimo-connector-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>geronimo</groupId>
-                                    <artifactId>geronimo-web-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>geronimo</groupId>
-                                    <artifactId>geronimo-naming-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>geronimo</groupId>
-                                    <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>openejb</groupId>
-                                    <artifactId>openejb-builder</artifactId>
-                                    <version>${openejbVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>geronimo</groupId>
-                                    <artifactId>geronimo-security-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>geronimo</groupId>
                                     <artifactId>geronimo-system</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
@@ -238,99 +203,6 @@
             <groupId>org.apache.geronimo.schema</groupId>
             <artifactId>geronimo-schema-j2ee_1.4</artifactId>
             <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimoVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-qname_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
-            <version>${geronimoVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${geronimoVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimoVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-builder</artifactId>
-            <version>${openejbVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>geronimo-spec</groupId>
-                    <artifactId>geronimo-spec-corba</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.schema</groupId>
-                    <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF Thu Mar 13 19:57:55 2008
@@ -5,21 +5,13 @@
 Bundle-Version: 2.1.0
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-ClassPath: lib/geronimo-common-2.0.1.jar,
- lib/geronimo-connector-builder-2.0.1.jar,
  lib/geronimo-deploy-jsr88-2.0.1.jar,
  lib/geronimo-deployment-2.0.1.jar,
- lib/geronimo-j2ee-builder-2.0.1.jar,
  lib/geronimo-j2ee-schema-2.0.1.jar,
  lib/geronimo-kernel-2.0.1.jar,
- lib/geronimo-naming-builder-2.0.1.jar,
- lib/geronimo-security-builder-2.0.1.jar,
- lib/geronimo-service-builder-2.0.1.jar,
  lib/geronimo-system-2.0.1.jar,
  lib/geronimo-util-2.0.1.jar,
- lib/geronimo-web-2.5-builder-2.0.1.jar,
- lib/geronimo-schema-jee_5-1.1.jar,
  lib/geronimo-deploy-config-2.0.1.jar,
- lib/geronimo-openejb-builder-2.0.1.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
 Export-Package: 
  javax.enterprise.deploy.model,
@@ -32,30 +24,17 @@
  javax.enterprise.deploy.spi.status,
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
- org.apache.geronimo.connector.deployment,
- org.apache.geronimo.connector.deployment.dconfigbean,
- org.apache.geronimo.connector.deployment.jsr88,
  org.apache.geronimo.deployment,
- org.apache.geronimo.deployment.javabean.xbeans,
- org.apache.geronimo.deployment.javabean.xbeans.impl,
  org.apache.geronimo.deployment.plugin,
  org.apache.geronimo.deployment.plugin.factories,
  org.apache.geronimo.deployment.plugin.jmx,
  org.apache.geronimo.deployment.plugin.local,
  org.apache.geronimo.deployment.plugin.remote,
- org.apache.geronimo.deployment.service,
- org.apache.geronimo.deployment.service.jsr88,
  org.apache.geronimo.deployment.util,
- org.apache.geronimo.deployment.xbeans,
- org.apache.geronimo.deployment.xbeans.impl,
  org.apache.geronimo.deployment.xml,
  org.apache.geronimo.deployment.xmlbeans,
  org.apache.geronimo.gbean,
  org.apache.geronimo.gbean.runtime,
- org.apache.geronimo.j2ee,
- org.apache.geronimo.j2ee.deployment,
- org.apache.geronimo.j2ee.deployment.annotation,
- org.apache.geronimo.j2ee.jsr88,
  org.apache.geronimo.kernel,
  org.apache.geronimo.kernel.basic,
  org.apache.geronimo.kernel.classloader,
@@ -68,13 +47,7 @@
  org.apache.geronimo.kernel.repository,
  org.apache.geronimo.kernel.rmi,
  org.apache.geronimo.kernel.util,
- org.apache.geronimo.naming.deployment,
- org.apache.geronimo.naming.deployment.jsr88,
- org.apache.geronimo.openejb.deployment,
- org.apache.geronimo.openejb.xbeans.ejbjar,
- org.apache.geronimo.openejb.xbeans.ejbjar.impl,
  org.apache.geronimo.schema,
- org.apache.geronimo.security.deployment,
  org.apache.geronimo.system.configuration,
  org.apache.geronimo.system.configuration.cli,
  org.apache.geronimo.system.configuration.condition,
@@ -107,62 +80,5 @@
  org.apache.geronimo.util.encoders,
  org.apache.geronimo.util.jce,
  org.apache.geronimo.util.jce.interfaces,
- org.apache.geronimo.util.jce.provider,
- org.apache.geronimo.web.deployment,
- org.apache.geronimo.xbeans.geronimo,
- org.apache.geronimo.xbeans.geronimo.credentialstore,
- org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
- org.apache.geronimo.xbeans.geronimo.impl,
- org.apache.geronimo.xbeans.geronimo.j2ee,
- org.apache.geronimo.xbeans.geronimo.j2ee.impl,
- org.apache.geronimo.xbeans.geronimo.loginconfig,
- org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
- org.apache.geronimo.xbeans.geronimo.naming,
- org.apache.geronimo.xbeans.geronimo.naming.impl,
- org.apache.geronimo.xbeans.geronimo.security,
- org.apache.geronimo.xbeans.geronimo.security.impl,
- org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
- org.apache.geronimo.xbeans.geronimo.security.subjectinfo.impl,
- org.apache.geronimo.xbeans.geronimo.web,
- org.apache.geronimo.xbeans.geronimo.web.impl,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.javabean.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.openejb.xbeans.ejbjar,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.credentialstore,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.j2ee,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.loginconfig,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.naming,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.web,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.src,
- schemaorg_apache_xmlbeans.system.sAD0A02D5B50A03344A8F7BF41013BBFA,
- schemaorg_apache_xmlbeans.system.sEDE7C0CB21AFE6786DC0D3F684755625,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2
+ org.apache.geronimo.util.jce.provider
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Thu Mar 13 19:57:55 2008
@@ -95,46 +95,6 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-service-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-connector-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-web-2.5-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.schema</groupId>
-                                    <artifactId>geronimo-schema-jee_5</artifactId>
-                                    <version>1.1</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-naming-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-openejb-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-security-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-system</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
@@ -230,46 +190,6 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-jee_5</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Thu Mar 13 19:57:55 2008
@@ -5,22 +5,14 @@
 Bundle-Version: 2.1.0
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-ClassPath: lib/geronimo-common-2.1.jar,
- lib/geronimo-connector-builder-2.1.jar,
  lib/geronimo-deploy-jsr88-2.1.jar,
  lib/geronimo-deployment-2.1.jar,
- lib/geronimo-j2ee-builder-2.1.jar,
  lib/geronimo-j2ee-schema-2.1.jar,
  lib/geronimo-kernel-2.1.jar,
- lib/geronimo-naming-builder-2.1.jar,
  lib/geronimo-plugin-2.1.jar,
- lib/geronimo-security-builder-2.1.jar,
- lib/geronimo-service-builder-2.1.jar,
  lib/geronimo-system-2.1.jar,
  lib/geronimo-util-2.1.jar,
- lib/geronimo-web-2.5-builder-2.1.jar,
- lib/geronimo-schema-jee_5-1.1.jar,
  lib/geronimo-deploy-config-2.1.jar,
- lib/geronimo-openejb-builder-2.1.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
  lib/plexus-archiver-1.0-alpha-7.jar
 Export-Package: 
@@ -34,30 +26,17 @@
  javax.enterprise.deploy.spi.status,
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
- org.apache.geronimo.connector.deployment,
- org.apache.geronimo.connector.deployment.dconfigbean,
- org.apache.geronimo.connector.deployment.jsr88,
  org.apache.geronimo.deployment,
- org.apache.geronimo.deployment.javabean.xbeans,
- org.apache.geronimo.deployment.javabean.xbeans.impl,
  org.apache.geronimo.deployment.plugin,
  org.apache.geronimo.deployment.plugin.factories,
  org.apache.geronimo.deployment.plugin.jmx,
  org.apache.geronimo.deployment.plugin.local,
  org.apache.geronimo.deployment.plugin.remote,
- org.apache.geronimo.deployment.service,
- org.apache.geronimo.deployment.service.jsr88,
  org.apache.geronimo.deployment.util,
- org.apache.geronimo.deployment.xbeans,
- org.apache.geronimo.deployment.xbeans.impl,
  org.apache.geronimo.deployment.xml,
  org.apache.geronimo.deployment.xmlbeans,
  org.apache.geronimo.gbean,
  org.apache.geronimo.gbean.runtime,
- org.apache.geronimo.j2ee,
- org.apache.geronimo.j2ee.deployment,
- org.apache.geronimo.j2ee.deployment.annotation,
- org.apache.geronimo.j2ee.jsr88,
  org.apache.geronimo.kernel,
  org.apache.geronimo.kernel.basic,
  org.apache.geronimo.kernel.classloader,
@@ -70,13 +49,7 @@
  org.apache.geronimo.kernel.repository,
  org.apache.geronimo.kernel.rmi,
  org.apache.geronimo.kernel.util,
- org.apache.geronimo.naming.deployment,
- org.apache.geronimo.naming.deployment.jsr88,
- org.apache.geronimo.openejb.deployment,
- org.apache.geronimo.openejb.xbeans.ejbjar,
- org.apache.geronimo.openejb.xbeans.ejbjar.impl,
  org.apache.geronimo.schema,
- org.apache.geronimo.security.deployment,
  org.apache.geronimo.system.configuration,
  org.apache.geronimo.system.configuration.cli,
  org.apache.geronimo.system.configuration.condition,
@@ -93,30 +66,6 @@
  org.apache.geronimo.system.sharedlib,
  org.apache.geronimo.system.threads,
  org.apache.geronimo.system.util,
- org.apache.geronimo.web.deployment,
- org.apache.geronimo.web25.deployment,
- org.apache.geronimo.xbeans.geronimo,
- org.apache.geronimo.xbeans.geronimo.credentialstore,
- org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
- org.apache.geronimo.xbeans.geronimo.impl,
- org.apache.geronimo.xbeans.geronimo.j2ee,
- org.apache.geronimo.xbeans.geronimo.j2ee.impl,
- org.apache.geronimo.xbeans.geronimo.loginconfig,
- org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
- org.apache.geronimo.xbeans.geronimo.naming,
- org.apache.geronimo.xbeans.geronimo.naming.impl,
- org.apache.geronimo.xbeans.geronimo.security,
- org.apache.geronimo.xbeans.geronimo.security.impl,
- org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
- org.apache.geronimo.xbeans.geronimo.security.subjectinfo.impl,
- org.apache.geronimo.xbeans.geronimo.web,
- org.apache.geronimo.xbeans.geronimo.web.impl,
- org.apache.geronimo.xbeans.javaee,
- org.apache.geronimo.xbeans.javaee.impl,
- org.apache.geronimo.xbeans.persistence,
- org.apache.geronimo.xbeans.persistence.impl,
- org.apache.geronimo.xml.ns.security12,
- org.apache.geronimo.xml.ns.security12.impl,
  org.codehaus.plexus.archiver,
  org.codehaus.plexus.archiver.bzip2,
  org.codehaus.plexus.archiver.dir,
@@ -128,78 +77,5 @@
  org.codehaus.plexus.archiver.tar,
  org.codehaus.plexus.archiver.util,
  org.codehaus.plexus.archiver.war,
- org.codehaus.plexus.archiver.zip,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fpersistence,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_0E39BB9D818BB2BD7E3628F83CF21ECA5D5ECF24,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_521F7E75CA17EA2C9BCBC0A5AE097E5AA9658CB3,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_70451B7785DCF15F72581E297E60DBA28AAF376A,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_DD11D3463E5BAAF740BE0AEBF1D38B014DD1AA20,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
- schemaorg_apache_xmlbeans.identityconstraint.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
- schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.javabean.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.openejb.xbeans.ejbjar,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.credentialstore,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.j2ee,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.loginconfig,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.naming,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.web,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.javaee, 
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence, 
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence.PersistenceDocument,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence.PersistenceDocument.Persistence,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence.PersistenceDocument.Persistence.PersistenceUnit,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence.PersistenceDocument.Persistence.PersistenceUnit.Properties,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xml.ns.security12,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fpersistence,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_0E39BB9D818BB2BD7E3628F83CF21ECA5D5ECF24,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_521F7E75CA17EA2C9BCBC0A5AE097E5AA9658CB3,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_70451B7785DCF15F72581E297E60DBA28AAF376A,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_DD11D3463E5BAAF740BE0AEBF1D38B014DD1AA20,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
- schemaorg_apache_xmlbeans.src,
- schemaorg_apache_xmlbeans.system.sAD0A02D5B50A03344A8F7BF41013BBFA,
- schemaorg_apache_xmlbeans.system.sAB6328A82D9B03971181A657735538BA,
- schemaorg_apache_xmlbeans.system.sA1B3CA54CF93388C8DDA7A8A0FDDABB6,
- schemaorg_apache_xmlbeans.system.s201396FB585000C771A01656A7C189E4,
- schemaorg_apache_xmlbeans.system.s89707DCAF3CBDF7238EB45FA6C3735CD,
- schemaorg_apache_xmlbeans.system.s794A99A3152C720B77CF1939795046F7,
- schemaorg_apache_xmlbeans.system.s8B5C097D1DA856114A6FCF66D1BD9471,
- schemaorg_apache_xmlbeans.system.s8AF8E0CE57F2BB021E91A9ABBD290FAF,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fpersistence,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_0E39BB9D818BB2BD7E3628F83CF21ECA5D5ECF24,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_521F7E75CA17EA2C9BCBC0A5AE097E5AA9658CB3,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_70451B7785DCF15F72581E297E60DBA28AAF376A,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_DD11D3463E5BAAF740BE0AEBF1D38B014DD1AA20,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005
+ org.codehaus.plexus.archiver.zip
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Thu Mar 13 19:57:55 2008
@@ -90,46 +90,6 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
-                                    <artifactId>geronimo-service-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-connector-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-web-2.5-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.schema</groupId>
-                                    <artifactId>geronimo-schema-jee_5</artifactId>
-                                    <version>1.1</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-naming-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-openejb-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-security-builder</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-system</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
@@ -230,46 +190,6 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-jee_5</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb-builder</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java Thu Mar 13 19:57:55 2008
@@ -16,8 +16,6 @@
  */
 package org.apache.geronimo.st.core;
 
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jst.server.core.IJavaRuntime;
@@ -27,13 +25,13 @@
  */
 public interface IGeronimoRuntime extends IJavaRuntime {
 	
-	public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException;
+	//public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException;
 	
-	public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException;
+	//public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException;
 	
-	public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException;
+	//public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException;
 	
-	public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException;
+	//public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException;
 	
 	public IPath getRuntimeSourceLocation();
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/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/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java Thu Mar 13 19:57:55 2008
@@ -20,8 +20,6 @@
 
 import org.apache.geronimo.st.core.GeronimoUtils;
 import org.apache.geronimo.st.core.IGeronimoRuntime;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -70,35 +68,35 @@
 
 		IFile planFile = null;
 		
-		try {
+		//try {
 			if (type.equals(IModuleConstants.JST_WEB_MODULE)) {
 				planFile = GeronimoUtils.getWebDeploymentPlanFile(comp);
-				runtime.fixGeronimoWebSchema(planFile);	
+				//runtime.fixGeronimoWebSchema(planFile);	
 			} else if (type.equals(IModuleConstants.JST_EJB_MODULE)) {
 				planFile = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
-				runtime.fixGeronimoEjbSchema(planFile);
+				//runtime.fixGeronimoEjbSchema(planFile);
 			} else if (type.equals(IModuleConstants.JST_EAR_MODULE)) {
 				planFile = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
-				runtime.fixGeronimoEarSchema(planFile);
+				//runtime.fixGeronimoEarSchema(planFile);
 			} else if (type.equals(IModuleConstants.JST_CONNECTOR_MODULE)) {
 				planFile = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
-				runtime.fixGeronimoConnectorSchema(planFile);
+				//runtime.fixGeronimoConnectorSchema(planFile);
 			}
-		} catch (XmlException e) {
-			throw new ExecutionException("Error fixing plan., e");
-		}
+		//} catch (XmlException e) {
+		//	throw new ExecutionException("Error fixing plan., e");
+		//}
 
 		return Status.OK_STATUS;
 	}
 
-	private void save(XmlObject object, IFile file) {
-		try {
-			object.save(file.getLocation().toFile());
-			file.refreshLocal(IFile.DEPTH_ONE, null);
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
+	//private void save(XmlObject object, IFile file) {
+	//	try {
+	//		object.save(file.getLocation().toFile());
+	//		file.refreshLocal(IFile.DEPTH_ONE, null);
+	//	} catch (IOException e) {
+	//		e.printStackTrace();
+	//	} catch (CoreException e) {
+	//		e.printStackTrace();
+	//	}
+	//}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java Thu Mar 13 19:57:55 2008
@@ -19,21 +19,10 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
-import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
-import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
 
 /**
  * @version $Rev$ $Date$
@@ -45,84 +34,84 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoConnectorSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerConnectorDocument.type.getDocumentElementName(),
-                    GerConnectorType.type);
-                save(xmlplan, plan);
-            }	
-            return xmlplan;
-	}
+	//public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //        if (plan != null) {
+    //           SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerConnectorDocument.type.getDocumentElementName(),
+    //                GerConnectorType.type);
+    //            save(xmlplan, plan);
+    //        }	
+    //        return xmlplan;
+	//}
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEarSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerApplicationDocument.type.getDocumentElementName(),
-                    GerApplicationType.type);
-                save(xmlplan, plan);
-            }
-            return xmlplan;
-    }
+	//public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //        if (plan != null) {
+    //            SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerApplicationDocument.type.getDocumentElementName(),
+    //                GerApplicationType.type);
+    //            save(xmlplan, plan);
+    //        }
+    //        return xmlplan;
+    //}
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEjbSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, OpenejbOpenejbJarDocument.type.getDocumentElementName(),
-                    OpenejbOpenejbJarType.type);
-                save(xmlplan, plan);
-            }
-            return xmlplan;
-	}
+	//public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //        if (plan != null) {
+    //            SchemaConversionUtils.fixGeronimoSchema(xmlplan, OpenejbOpenejbJarDocument.type.getDocumentElementName(),
+    //                OpenejbOpenejbJarType.type);
+    //            save(xmlplan, plan);
+    //        }
+    //        return xmlplan;
+	//}
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoWebSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerWebAppDocument.type.getDocumentElementName(),
-                    GerWebAppType.type);
-                save(xmlplan, plan);
-            }
-            return xmlplan; 
-	}
+	//public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //        if (plan != null) {
+    //            SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerWebAppDocument.type.getDocumentElementName(),
+    //                GerWebAppType.type);
+    //            save(xmlplan, plan);
+    //        }
+    //        return xmlplan; 
+	//}
 	
-	private XmlObject getXmlObject(IFile plan) {
-		if (plan.exists()) {
-			try {
-				return XmlBeansUtil.parse(plan.getLocation().toFile().toURL());
-			} catch (MalformedURLException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			} catch (XmlException e) {
-				e.printStackTrace();
-			}
-		}
-		return null;
-	}
-
- 	private void save(XmlObject object, IFile file) {
-        try {
- 	        object.save(file.getLocation().toFile());
- 	        file.refreshLocal(IFile.DEPTH_ONE, null);
- 	    } catch (IOException e) {
- 	          e.printStackTrace();
- 	    } catch (CoreException e) {
- 		     e.printStackTrace();
- 	    }
- 	}
+	//private XmlObject getXmlObject(IFile plan) {
+	//	if (plan.exists()) {
+	//		try {
+	//			return XmlBeansUtil.parse(plan.getLocation().toFile().toURL());
+	//		} catch (MalformedURLException e) {
+	//			e.printStackTrace();
+	//		} catch (IOException e) {
+	//			e.printStackTrace();
+	//		} catch (XmlException e) {
+	//			e.printStackTrace();
+	//		}
+	//	}
+	//	return null;
+	//}
+
+ 	//private void save(XmlObject object, IFile file) {
+    //    try {
+ 	//        object.save(file.getLocation().toFile());
+ 	//        file.refreshLocal(IFile.DEPTH_ONE, null);
+ 	//    } catch (IOException e) {
+ 	//          e.printStackTrace();
+ 	//    } catch (CoreException e) {
+ 	//	     e.printStackTrace();
+ 	//    }
+ 	//}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/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/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java Thu Mar 13 19:57:55 2008
@@ -16,27 +16,18 @@
  */
 package org.apache.geronimo.st.v11.core;
 
-import java.io.IOException;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.geronimo.deployment.xbeans.EnvironmentDocument;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.st.core.GeronimoUtils;
 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.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.common.componentcore.ComponentCore;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.server.core.IModule;
 import org.openejb.xml.ns.openejb_jar_2.OpenejbJarType;
@@ -62,41 +53,41 @@
 		return null;
 	}
 	
-	public static String getConfigId2(IModule module) {
-		
-		IFile planFile = null;
-		IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
-		if (isWebModule(module)) {
-			planFile = GeronimoUtils.getWebDeploymentPlanFile(comp);
-		} else if (isEjbJarModule(module)) {
-			planFile = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
-		} else if (isEarModule(module)) {
-			planFile = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
-		} else if (isRARModule(module)) {
-			planFile = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
-		}
-		
-		if(planFile != null) {
-			try {
-				XmlObject xmlObject = XmlBeansUtil.parse(planFile.getLocation().toFile());
-				XmlCursor cursor = xmlObject.newCursor();
-				cursor.toFirstChild();
-				xmlObject = cursor.getObject();
-				XmlObject result[] = xmlObject.selectChildren(QNameSet.singleton(EnvironmentDocument.type.getDocumentElementName()));
-				if(result != null && result.length > 0) {
-					org.apache.geronimo.deployment.xbeans.EnvironmentType env = (org.apache.geronimo.deployment.xbeans.EnvironmentType) result[0].changeType(org.apache.geronimo.deployment.xbeans.EnvironmentType.type);
-					org.apache.geronimo.deployment.xbeans.ArtifactType moduleId = env.getModuleId();
-					return getQualifiedConfigID(moduleId);
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			} catch (XmlException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		return null;
-	}
+	//public static String getConfigId2(IModule module) {
+	//	
+	//	IFile planFile = null;
+	//	IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
+	//	if (isWebModule(module)) {
+	//		planFile = GeronimoUtils.getWebDeploymentPlanFile(comp);
+	//	} else if (isEjbJarModule(module)) {
+	//		planFile = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
+	//	} else if (isEarModule(module)) {
+	//		planFile = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
+	//	} else if (isRARModule(module)) {
+	//		planFile = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
+	//	}
+	//	
+	//	if(planFile != null) {
+	//		try {
+	//			XmlObject xmlObject = XmlBeansUtil.parse(planFile.getLocation().toFile());
+	//			XmlCursor cursor = xmlObject.newCursor();
+	//			cursor.toFirstChild();
+	//			xmlObject = cursor.getObject();
+	//			XmlObject result[] = xmlObject.selectChildren(QNameSet.singleton(EnvironmentDocument.type.getDocumentElementName()));
+	//			if(result != null && result.length > 0) {
+	//				org.apache.geronimo.deployment.xbeans.EnvironmentType env = (org.apache.geronimo.deployment.xbeans.EnvironmentType) result[0].changeType(org.apache.geronimo.deployment.xbeans.EnvironmentType.type);
+	//				org.apache.geronimo.deployment.xbeans.ArtifactType moduleId = env.getModuleId();
+	//				return getQualifiedConfigID(moduleId);
+	//			}
+	//		} catch (IOException e) {
+	//			e.printStackTrace();
+	//		} catch (XmlException e) {
+	//			e.printStackTrace();
+	//		}
+	//	}
+	//	
+	//	return null;
+	//}
 
 	public static String getConfigId(IModule module) {
 
@@ -131,9 +122,9 @@
 		return getQualifiedConfigID(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
 	}
 	
-	public static String getQualifiedConfigID(org.apache.geronimo.deployment.xbeans.ArtifactType artifact) {
-		return getQualifiedConfigID(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
-	}
+	//public static String getQualifiedConfigID(org.apache.geronimo.deployment.xbeans.ArtifactType artifact) {
+	//	return getQualifiedConfigID(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
+	//}
 	
 	public static String getQualifiedConfigID(String groupId, String artifactId, String version, String type) {
 		return groupId + "/" + artifactId + "/" + version + "/" + type;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11VersionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11VersionHandler.java?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11VersionHandler.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoV11VersionHandler.java Thu Mar 13 19:57:55 2008
@@ -33,7 +33,7 @@
 	 * @see org.apache.geronimo.st.core.IGeronimoVersionHandler#getConfigID(org.eclipse.wst.server.core.IModule)
 	 */
 	public String getConfigID(IModule module) {
-		return GeronimoV11Utils.getConfigId2(module);
+		return GeronimoV11Utils.getConfigId(module);
 	}
 	
 	/* (non-Javadoc)

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoRuntime.java?rev=636971&r1=636970&r2=636971&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoRuntime.java Thu Mar 13 19:57:55 2008
@@ -22,14 +22,6 @@
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
-import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
-import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 
@@ -43,84 +35,84 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoConnectorSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerConnectorDocument.type.getDocumentElementName(),
-                    GerConnectorType.type);
-                save(xmlplan, plan);
-            }	
-            return xmlplan;
-	}
+	//public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //        if (plan != null) {
+    //            SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerConnectorDocument.type.getDocumentElementName(),
+    //                GerConnectorType.type);
+    //            save(xmlplan, plan);
+    //        }	
+    //        return xmlplan;
+	//}
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEarSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerApplicationDocument.type.getDocumentElementName(),
-                    GerApplicationType.type);
-                save(xmlplan, plan);
-            }
-            return xmlplan;
-    }
+	//public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //        if (plan != null) {
+    //            SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerApplicationDocument.type.getDocumentElementName(),
+    //                GerApplicationType.type);
+    //            save(xmlplan, plan);
+    //        }
+    //        return xmlplan;
+    //}
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEjbSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
+	//public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
             //FIXME
-            /*if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, OpenejbOpenejbJarDocument.type.getDocumentElementName(), OpenejbOpenejbJarType.type);
-                save(xmlplan, plan);
-            }*/
-            return xmlplan;
-	}
+            //if (plan != null) {
+            //    SchemaConversionUtils.fixGeronimoSchema(xmlplan, OpenejbOpenejbJarDocument.type.getDocumentElementName(), OpenejbOpenejbJarType.type);
+            //    save(xmlplan, plan);
+            //}
+    //        return xmlplan;
+	//}
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoWebSchema(org.eclipse.core.resources.IFile)
 	 */
-	public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
-            XmlObject xmlplan = getXmlObject(plan);
-            if (plan != null) {
-                SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerWebAppDocument.type.getDocumentElementName(),
-                    GerWebAppType.type);
-                save(xmlplan, plan);
-            }
-            return xmlplan; 
-	}
+	//public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
+    //        XmlObject xmlplan = getXmlObject(plan);
+    //       if (plan != null) {
+    //            SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerWebAppDocument.type.getDocumentElementName(),
+    //                GerWebAppType.type);
+    //            save(xmlplan, plan);
+    //        }
+    //        return xmlplan; 
+	//}
 	
-	private XmlObject getXmlObject(IFile plan) {
-		if (plan.exists()) {
-			try {
-				return XmlBeansUtil.parse(plan.getLocation().toFile().toURL(), null);
-			} catch (MalformedURLException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			} catch (XmlException e) {
-				e.printStackTrace();
-			}
-		}
-		return null;
-	}
-
- 	private void save(XmlObject object, IFile file) {
-        try {
- 	        object.save(file.getLocation().toFile());
- 	        file.refreshLocal(IFile.DEPTH_ONE, null);
- 	    } catch (IOException e) {
- 	          e.printStackTrace();
- 	    } catch (CoreException e) {
- 		     e.printStackTrace();
- 	    }
- 	}
+	//private XmlObject getXmlObject(IFile plan) {
+	//	if (plan.exists()) {
+	//		try {
+	//			return XmlBeansUtil.parse(plan.getLocation().toFile().toURL(), null);
+	//		} catch (MalformedURLException e) {
+	//			e.printStackTrace();
+	//		} catch (IOException e) {
+	//			e.printStackTrace();
+	//		} catch (XmlException e) {
+	//			e.printStackTrace();
+	//		}
+	//	}
+	//	return null;
+	//}
+
+ 	//private void save(XmlObject object, IFile file) {
+    //   try {
+ 	//        object.save(file.getLocation().toFile());
+ 	//        file.refreshLocal(IFile.DEPTH_ONE, null);
+ 	//    } catch (IOException e) {
+ 	//          e.printStackTrace();
+ 	//    } catch (CoreException e) {
+ 	//	     e.printStackTrace();
+ 	//   }
+ 	//}
 }



Mime
View raw message