geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r836047 - in /geronimo/server/trunk: framework/modules/geronimo-service-builder/ plugins/client/geronimo-client-builder/ plugins/connector-1_6/geronimo-connector-builder-1_6/ plugins/corba/geronimo-corba-builder/ plugins/j2ee/geronimo-j2ee-...
Date Fri, 13 Nov 2009 22:51:53 GMT
Author: rickmcguire
Date: Fri Nov 13 22:51:53 2009
New Revision: 836047

URL: http://svn.apache.org/viewvc?rev=836047&view=rev
Log:
Some more xmlbeans bundle cleanup

Modified:
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
    geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -110,10 +110,11 @@
                         <Export-Package>
                             org.apache.geronimo.deployment.xbeans.impl,
                             org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans*,
-                            org.apache.geronimo.deployment.javabean.xbeans*,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
                             org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service*
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88
                         </Export-Package>
                         <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
                         <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -32,7 +32,7 @@
     <artifactId>geronimo-client-builder</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Client :: Builder</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -53,7 +53,7 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -61,6 +61,70 @@
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
         </plugins>
+        <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+                <instructions>
+                    <!--packages containing "impl" or "internal" are excluded by default
-->
+                    <Export-Package>
+                        org.apache.geronimo.client.builder,
+                        org.apache.geronimo.client.builder.jsr88,
+                        org.apache.geronimo.xbeans.geronimo.client,
+                        org.apache.geronimo.xbeans.geronimo.client.impl
+                    </Export-Package>
+                    <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                    <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                    <Import-Package>
+                        org.apache.geronimo.xbeans.javaee.impl,
+                        org.apache.geronimo.xbeans.javaee,
+                        org.apache.geronimo.xbeans.persistence.impl,
+                        org.apache.geronimo.xbeans.persistence,
+                        org.apache.geronimo.xbeans.j2ee.impl,
+                        org.apache.geronimo.xbeans.j2ee,
+                        org.w3.xml.x1998.namespace.impl,
+                        org.w3.xml.x1998.namespace,
+                        org.apache.geronimo.deployment.xbeans.impl,
+                        org.apache.geronimo.deployment.javabean.xbeans.impl,
+                        org.apache.geronimo.deployment.xbeans,
+                        org.apache.geronimo.deployment.javabean.xbeans,
+                        org.apache.geronimo.deployment.dconfigbean,
+                        org.apache.geronimo.deployment.service,
+                        org.apache.geronimo.deployment.service.jsr88,
+                        org.apache.xmlbeans.impl.schema;version="2.4",
+                        org.apache.geronimo.connector.deployment,
+                        org.apache.geronimo.connector.deployment.dconfigbean,
+                        org.apache.geronimo.connector.deployment.jsr88,
+                        org.apache.geronimo.xbeans.connector,
+                        org.apache.geronimo.xbeans.connector.impl
+                        org.apache.geronimo.xbeans.geronimo.j2ee,
+                        org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                        org.apache.geronimo.j2ee.deployment,
+                        org.apache.geronimo.j2ee.deployment.annotation,
+                        org.apache.geronimo.j2ee.jsr88,
+                        org.apache.geronimo.xbeans.geronimo.naming,
+                        org.apache.geronimo.xbeans.geronimo.naming.impl,
+                        org.apache.geronimo.naming.deployment,
+                        org.apache.geronimo.naming.deployment.jsr88,
+                        org.apache.geronimo.security.deployment,
+                        org.apache.geronimo.xml.ns.security12,
+                        org.apache.geronimo.xml.ns.security12.impl,
+                        org.apache.geronimo.xbeans.geronimo.credentialstore,
+                        org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
+                        org.apache.geronimo.xbeans.geronimo.jaspi,
+                        org.apache.geronimo.xbeans.geronimo.jaspi.impl,
+                        org.apache.geronimo.xbeans.geronimo.loginconfig,
+                        org.apache.geronimo.xbeans.geronimo.loginconfig.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,
+                        *
+                    </Import-Package>
+                    <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                </instructions>
+            </configuration>
+        </plugin>
     </build>
 
 </project>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml Fri
Nov 13 22:51:53 2009
@@ -101,8 +101,6 @@
                         <!--packages containing "impl" or "internal" are excluded by default
-->
                         <Import-Package>
                               org.apache.xmlbeans.impl.schema;version="2.4",
-                              org.apache.geronimo.deployment.xbeans.impl,
-                              org.apache.geronimo.deployment.javabean.xbeans.impl,
                               org.apache.geronimo.xbeans.javaee.impl,
                               org.apache.geronimo.xbeans.javaee,
                               org.apache.geronimo.xbeans.persistence.impl,
@@ -111,6 +109,13 @@
                               org.apache.geronimo.xbeans.j2ee,
                               org.w3.xml.x1998.namespace.impl,
                               org.w3.xml.x1998.namespace,
+                              org.apache.geronimo.deployment.xbeans.impl,
+                              org.apache.geronimo.deployment.javabean.xbeans.impl,
+                              org.apache.geronimo.deployment.xbeans,
+                              org.apache.geronimo.deployment.javabean.xbeans,
+                              org.apache.geronimo.deployment.dconfigbean,
+                              org.apache.geronimo.deployment.service,
+                              org.apache.geronimo.deployment.service.jsr88,
                               org.apache.geronimo.xbeans.geronimo.naming,
                               org.apache.geronimo.xbeans.geronimo.naming.impl,
                               org.apache.geronimo.naming.deployment,

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -27,7 +27,7 @@
         <artifactId>corba</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <name>Geronimo Plugins, Corba :: Builder</name>
     <packaging>bundle</packaging>
@@ -40,7 +40,7 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- g-security-builder, g-naming-builder comes from this --> 
+        <!-- g-security-builder, g-naming-builder comes from this -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb-builder</artifactId>
@@ -55,6 +55,32 @@
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
         </plugins>
+        <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+                <instructions>
+                    <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    <Import-Package>
+                        org.w3.xml.x1998.namespace.impl,
+                        org.w3.xml.x1998.namespace,
+                        org.apache.xmlbeans.impl.schema;version="2.4",
+                        *
+                    </Import-Package>
+                    <Export-Package>
+                        org.apache.geronimo.corba.deployment,
+                        org.apache.geronimo.corba.security.config.css,
+                        org.apache.geronimo.corba.security.config.tss,
+                        org.apache.geronimo.corba.xbeans.csiv2.tss,
+                        org.apache.geronimo.corba.xbeans.csiv2.tss.impl,
+                        org.apache.geronimo.corba.xbeans.csiv2.css,
+                        org.apache.geronimo.corba.xbeans.csiv2.css.impl
+                    </Export-Package>
+                    <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                    <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                </instructions>
+            </configuration>
+        </plugin>
     </build>
 
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Fri Nov 13 22:51:53 2009
@@ -108,9 +108,7 @@
                             org.apache.geronimo.xbeans.geronimo.j2ee.impl,
                             org.apache.geronimo.j2ee.deployment,
                             org.apache.geronimo.j2ee.deployment.annotation,
-                            org.apache.geronimo.j2ee.jsr88,
-                            org.apache.geronimo.xbeans.j2ee.impl,
-                            org.apache.geronimo.xbeans.j2ee
+                            org.apache.geronimo.j2ee.jsr88
                         </Export-Package>
                         <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
                         <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
@@ -123,6 +121,13 @@
                             org.apache.geronimo.xbeans.j2ee,
                             org.w3.xml.x1998.namespace.impl,
                             org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
                             *
                         </Import-Package>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -83,6 +83,13 @@
                             org.apache.geronimo.xbeans.j2ee,
                             org.w3.xml.x1998.namespace.impl,
                             org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
                             *
                         </Import-Package>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -27,7 +27,7 @@
         <artifactId>j2ee</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-security-builder</artifactId>
     <packaging>bundle</packaging>
@@ -56,7 +56,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -68,7 +68,48 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",*</Import-Package>
+                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <Export-Package>
+                            org.apache.geronimo.security.deployment,
+                            org.apache.geronimo.xml.ns.security12,
+                            org.apache.geronimo.xml.ns.security12.impl,
+                            org.apache.geronimo.xbeans.geronimo.credentialstore,
+                            org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
+                            org.apache.geronimo.xbeans.geronimo.jaspi,
+                            org.apache.geronimo.xbeans.geronimo.jaspi.impl,
+                            org.apache.geronimo.xbeans.geronimo.loginconfig,
+                            org.apache.geronimo.xbeans.geronimo.loginconfig.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
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            *
+                        </Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -78,7 +78,46 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",*</Import-Package>
+                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <Export-Package>
+                            org.apache.geronimo.web.deployment,
+                            org.apache.geronimo.web25.deployment,
+                            org.apache.geronimo.web25.deployment.security,
+                            org.apache.geronimo.xbeans.geronimo.web,
+                            org.apache.geronimo.xbeans.geronimo.web.impl
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.jaspi,
+                            org.apache.geronimo.xbeans.geronimo.jaspi.impl,
+                            *
+                        </Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -27,25 +27,25 @@
         <artifactId>jetty7</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jetty7-builder</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Jetty :: Builder</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty7</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jee-specs</artifactId>
@@ -80,13 +80,62 @@
             <!--<scope>test</scope>-->
         <!--</dependency>-->
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <Export-Package>
+                            org.apache.geronimo.jetty7.deployment,
+                            org.apache.geronimo.xbeans.geronimo.web.jetty,
+                            org.apache.geronimo.xbeans.geronimo.web.jetty.impl,
+                            org.apache.geronimo.xbeans.geronimo.web.jetty.config,
+                            org.apache.geronimo.xbeans.geronimo.web.jetty.config.impl
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.jaspi,
+                            org.apache.geronimo.xbeans.geronimo.jaspi.impl,
+                            *
+                        </Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml Fri
Nov 13 22:51:53 2009
@@ -27,12 +27,12 @@
         <artifactId>jetty7</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jetty7-clustering-builder-wadi</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Jetty :: Clustering Builder for WADI Core</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -47,13 +47,58 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <Export-Package>
+                            org.apache.geronimo.jetty7.cluster.wadi.builder,
+                            org.apache.geronimo.xbeans.jetty7.cluster.wadi,
+                            org.apache.geronimo.xbeans.jetty7.cluster.wadi.impl
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            *
+                        </Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -117,6 +117,15 @@
                             org.apache.geronimo.connector.deployment.jsr88,
                             org.apache.geronimo.xbeans.connector,
                             org.apache.geronimo.xbeans.connector.impl,
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
                             *
                         </Import-Package>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
Fri Nov 13 22:51:53 2009
@@ -78,6 +78,15 @@
                             org.apache.geronimo.openejb.deployment,
                             org.apache.geronimo.openejb.xbeans.ejbjar,
                             org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
                             *
                         </Import-Package>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Fri Nov 13 22:51:53
2009
@@ -209,6 +209,17 @@
                             org.apache.geronimo.deployment.service,
                             org.apache.geronimo.deployment.service.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.jaspi,
+                            org.apache.geronimo.xbeans.geronimo.jaspi.impl,
                             *
                         </Import-Package>
                         <Export-Package>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
Fri Nov 13 22:51:53 2009
@@ -91,6 +91,11 @@
                             org.apache.geronimo.deployment.dconfigbean,
                             org.apache.geronimo.deployment.service,
                             org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
                             org.apache.geronimo.xbeans.geronimo.naming,
                             org.apache.geronimo.xbeans.geronimo.naming.impl,
                             org.apache.geronimo.naming.deployment,

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=836047&r1=836046&r2=836047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml Fri Nov
13 22:51:53 2009
@@ -81,32 +81,15 @@
                     <instructions>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                         <Import-Package>
-                            org.apache.geronimo.xbeans.javaee.impl,
-                            org.apache.geronimo.xbeans.javaee,
-                            org.apache.geronimo.xbeans.persistence.impl,
-                            org.apache.geronimo.xbeans.persistence,
-                            org.apache.geronimo.xbeans.j2ee.impl,
-                            org.apache.geronimo.xbeans.j2ee,
                             org.w3.xml.x1998.namespace.impl,
                             org.w3.xml.x1998.namespace,
-                            org.apache.geronimo.deployment.xbeans.impl,
-                            org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans,
-                            org.apache.geronimo.deployment.javabean.xbeans,
-                            org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service,
-                            org.apache.geronimo.deployment.service.jsr88,
-                            org.apache.geronimo.xbeans.geronimo.naming,
-                            org.apache.geronimo.xbeans.geronimo.naming.impl,
-                            org.apache.geronimo.naming.deployment,
-                            org.apache.geronimo.naming.deployment.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
                             *
                         </Import-Package>
                         <Export-Package>
                             org.apache.geronimo.webservices.builder,
                             org.apache.geronimo.xbeans.wsdl,
-                            org.apache.geronimo.xbeans.wsdl.impl,
+                            org.apache.geronimo.xbeans.wsdl.impl
                         </Export-Package>
                         <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
                         <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>



Mime
View raw message