You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2009/11/11 16:19:47 UTC
svn commit: r834903 - in /geronimo/server/trunk/plugins:
connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/ openejb/
openejb/geronimo-openejb-builder/
openejb/geronimo-openejb-clustering-builder-wadi/
openejb/geronimo-openejb-clustering-b...
Author: rickmcguire
Date: Wed Nov 11 15:19:47 2009
New Revision: 834903
URL: http://svn.apache.org/viewvc?rev=834903&view=rev
Log:
Clean up some of the xmlbeans usage in openejb
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/xmlconfig.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/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/OpenEJBClusteringWADIConverter.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/pom.xml
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/xmlconfig.xml?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/xmlconfig.xml Wed Nov 11 15:19:47 2009
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
- >
+<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
<xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
<xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
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=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Wed Nov 11 15:19:47 2009
@@ -96,9 +96,33 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <!--packages containing "impl" or "internal" are excluded by default -->
- <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",*</Import-Package>
<!--<_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.xmlbeans.impl.schema;version="2.4",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.geronimo.openejb.deployment,
+ org.apache.geronimo.openejb.xbeans.ejbjar,
+ org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+ </Export-Package>
+ <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+ <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
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=834903&r1=834902&r2=834903&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 Wed Nov 11 15:19:47 2009
@@ -53,6 +53,44 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <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.openejb.deployment,
+ org.apache.geronimo.openejb.xbeans.ejbjar,
+ org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+ org.apache.xmlbeans.impl.schema;version="2.4",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.geronimo.openejb.deployment.cluster,
+ org.apache.geronimo.openejb.cluster.xbeans,
+ org.apache.geronimo.openejb.cluster.xbeans.impl
+ </Export-Package>
+ <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+ <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/OpenEJBClusteringWADIConverter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/OpenEJBClusteringWADIConverter.java?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/OpenEJBClusteringWADIConverter.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/OpenEJBClusteringWADIConverter.java Wed Nov 11 15:19:47 2009
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import org.apache.geronimo.schema.ElementConverter;
-import org.apache.geronimo.xbeans.geronimo.GerOpenejbClusteringWadiDocument;
+import org.apache.geronimo.openejb.cluster.xbeans.GerOpenejbClusteringWadiDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.xmlbeans.XmlCursor;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java Wed Nov 11 15:19:47 2009
@@ -62,8 +62,8 @@
import org.apache.geronimo.openejb.deployment.XmlUtil;
import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.xbeans.geronimo.GerOpenejbClusteringWadiDocument;
-import org.apache.geronimo.xbeans.geronimo.GerOpenejbClusteringWadiType;
+import org.apache.geronimo.openejb.cluster.xbeans.GerOpenejbClusteringWadiDocument;
+import org.apache.geronimo.openejb.cluster.xbeans.GerOpenejbClusteringWadiType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerClusteringDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.openejb.jee.EjbJar;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml Wed Nov 11 15:19:47 2009
@@ -18,7 +18,7 @@
>
<xb:namespace uri="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2">
- <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
+ <xb:package>org.apache.geronimo.openejb.cluster.xbeans</xb:package>
<xb:prefix>Ger</xb:prefix>
</xb:namespace>
Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml Wed Nov 11 15:19:47 2009
@@ -71,6 +71,38 @@
</dependencies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <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.openejb.deployment,
+ org.apache.geronimo.openejb.xbeans.ejbjar,
+ org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+ org.apache.xmlbeans.impl.schema;version="2.4",
+ *
+ </Import-Package>
+ <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/history/dependencies.xml Wed Nov 11 15:19:47 2009
@@ -6,7 +6,7 @@
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-clustering-wadi</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=834903&r1=834902&r2=834903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Wed Nov 11 15:19:47 2009
@@ -45,7 +45,7 @@
<module>openejb-deployer</module>
<module>openejb-portlets</module>
<!--<module>openejb-console-jetty</module>-->
- <module>openejb-console-tomcat</module>
+ <!--<module>openejb-console-tomcat</module>-->
<module>openejb-clustering-wadi</module>
<module>openejb-clustering-builder-wadi</module>
</modules>