You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2010/04/24 07:39:18 UTC
svn commit: r937594 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/ org.apache.geronimo.st.core/ org.apache.geronimo.st.core/META-INF/ org.apache.geronimo.st.v30.ui/ org.apache.geronimo.st.v30.ui/M...

Author: mcconne
Date: Sat Apr 24 05:39:17 2010
New Revision: 937594

URL: http://svn.apache.org/viewvc?rev=937594&view=rev
Log:
Fix maven build problems

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF?rev=937594&r1=937593&r2=937594&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF Sat Apr 24 05:39:17 2010
@@ -6,20 +6,21 @@ 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 
-Export-Package: org.apache.geronimo.xml.ns.j2ee.application_1,
- org.apache.geronimo.xml.ns.deployment_1,
- org.apache.geronimo.xml.ns.deployment.javabean_1,
- org.apache.geronimo.xml.ns.j2ee.application_1,
- org.apache.geronimo.xml.ns.j2ee.application_client_1,
- org.apache.geronimo.xml.ns.j2ee.connector_1,
- org.apache.geronimo.xml.ns.j2ee.web_1,
- org.apache.geronimo.xml.ns.loginconfig_1,
- org.apache.geronimo.xml.ns.naming_1,
- org.apache.geronimo.xml.ns.security_1,
- org.openejb.xml.ns.corba_css_config_2,
- org.openejb.xml.ns.corba_tss_config_2,
- org.openejb.xml.ns.openejb_jar_2,
- org.openejb.xml.ns.pkgen_2
+Require-Bundle: 
+    org.eclipse.core.runtime 
+Export-Package: 
+    org.apache.geronimo.xml.ns.j2ee.application_1,
+    org.apache.geronimo.xml.ns.deployment_1,
+    org.apache.geronimo.xml.ns.deployment.javabean_1,
+    org.apache.geronimo.xml.ns.j2ee.application_1,
+    org.apache.geronimo.xml.ns.j2ee.application_client_1,
+    org.apache.geronimo.xml.ns.j2ee.connector_1,
+    org.apache.geronimo.xml.ns.j2ee.web_1,
+    org.apache.geronimo.xml.ns.loginconfig_1,
+    org.apache.geronimo.xml.ns.naming_1,
+    org.apache.geronimo.xml.ns.security_1,
+    org.openejb.xml.ns.corba_css_config_2,
+    org.openejb.xml.ns.corba_tss_config_2,
+    org.openejb.xml.ns.openejb_jar_2,
+    org.openejb.xml.ns.pkgen_2
 Import-Package: junit.framework;version="3.8.2"

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=937594&r1=937593&r2=937594&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 Sat Apr 24 05:39:17 2010
@@ -6,7 +6,8 @@ Bundle-Version: 3.0.0   
 Bundle-Activator: org.apache.geronimo.st.core.Activator
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.runtime.common,
+Require-Bundle: 
+ org.apache.geronimo.runtime.common,
  org.apache.geronimo.runtime.v30,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.eclipse.core.runtime,
@@ -33,7 +34,8 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.tptp.platform.profile.server.core;resolution:=optional,
  org.eclipse.tptp.platform.jvmti.client;resolution:=optional
 Bundle-ActivationPolicy: lazy
-Export-Package: org.apache.geronimo.st.core,
+Export-Package: 
+ org.apache.geronimo.st.core,
  org.apache.geronimo.st.core.commands,
  org.apache.geronimo.st.core.descriptor,
  org.apache.geronimo.st.core.internal,

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=937594&r1=937593&r2=937594&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 Sat Apr 24 05:39:17 2010
@@ -154,14 +154,5 @@
             <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF?rev=937594&r1=937593&r2=937594&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF Sat Apr 24 05:39:17 2010
@@ -5,22 +5,21 @@ Bundle-SymbolicName: org.apache.geronimo
 Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v30.ui.Activator
 Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.runtime.common,
- org.apache.geronimo.jee.v21.jaxbmodel,
- org.apache.geronimo.st.v21.core,
- org.apache.geronimo.st.ui,
- org.apache.geronimo.runtime.v30,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.commands,
- org.eclipse.debug.ui,
- org.eclipse.ui.forms,
- org.eclipse.core.resources,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui
+Require-Bundle: 
+    org.apache.geronimo.runtime.common,
+    org.apache.geronimo.jee.v21.jaxbmodel,
+    org.apache.geronimo.st.v30.core,
+    org.apache.geronimo.st.ui,
+    org.apache.geronimo.st.core,
+    org.apache.geronimo.runtime.v30,
+    org.eclipse.ui,
+    org.eclipse.core.runtime,
+    org.eclipse.core.commands,
+    org.eclipse.debug.ui,
+    org.eclipse.ui.forms,
+    org.eclipse.core.resources,
+    org.eclipse.wst.common.project.facet.ui,
+    org.eclipse.wst.server.core,
+    org.eclipse.wst.server.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Apache Software Foundation
-Import-Package: org.apache.geronimo.st.v30.core,
- org.apache.geronimo.st.v30.core.jaxb,
- org.apache.geronimo.st.v30.core.operations

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml?rev=937594&r1=937593&r2=937594&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml Sat Apr 24 05:39:17 2010
@@ -147,7 +147,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v21.core</artifactId>
+            <artifactId>org.apache.geronimo.st.v30.core</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>