geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r834946 - in /geronimo/server/trunk/plugins: jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/xsdconfig/ openejb/geronimo-openejb-clustering-builder-wadi/ openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/gero...
Date Wed, 11 Nov 2009 16:23:50 GMT
Author: rickmcguire
Date: Wed Nov 11 16:23:49 2009
New Revision: 834946

URL: http://svn.apache.org/viewvc?rev=834946&view=rev
Log:
Clean up some of the xmlbeans usage in tomcat

Modified:
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.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/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/TomcatClusteringWADIConverter.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml?rev=834946&r1=834945&r2=834946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
Wed Nov 11 16:23:49 2009
@@ -18,7 +18,7 @@
     >
 
     <xb:namespace uri="http://geronimo.apache.org/xml/ns/clustering-wadi-1.2">
-        <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
+        <xb:package>org.apache.geronimo.xbeans.jetty7.cluster.wadi</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>
 

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=834946&r1=834945&r2=834946&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 16:23:49 2009
@@ -83,8 +83,8 @@
                         </Import-Package>
                         <Export-Package>
                             org.apache.geronimo.openejb.deployment.cluster,
-                            org.apache.geronimo.openejb.cluster.xbeans,
-                            org.apache.geronimo.openejb.cluster.xbeans.impl
+                            org.apache.geronimo.xbeans.openejb.cluster.wadi,
+                            org.apache.geronimo.xbeans.openejb.cluster.wadi.impl
                         </Export-Package>
                         <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
                         <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>

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=834946&r1=834945&r2=834946&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 16:23:49 2009
@@ -22,7 +22,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.geronimo.schema.ElementConverter;
-import org.apache.geronimo.openejb.cluster.xbeans.GerOpenejbClusteringWadiDocument;
+import org.apache.geronimo.xbeans.openejb.cluster.wadi.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=834946&r1=834945&r2=834946&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 16:23:49 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.openejb.cluster.xbeans.GerOpenejbClusteringWadiDocument;
-import org.apache.geronimo.openejb.cluster.xbeans.GerOpenejbClusteringWadiType;
+import org.apache.geronimo.xbeans.openejb.cluster.wadi.GerOpenejbClusteringWadiDocument;
+import org.apache.geronimo.xbeans.openejb.cluster.wadi.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=834946&r1=834945&r2=834946&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 16:23:49 2009
@@ -18,7 +18,7 @@
     >
 
     <xb:namespace uri="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2">
-        <xb:package>org.apache.geronimo.openejb.cluster.xbeans</xb:package>
+        <xb:package>org.apache.geronimo.xbeans.openejb.cluster.wadi</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>
 

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=834946&r1=834945&r2=834946&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
Wed Nov 11 16:23:49 2009
@@ -27,12 +27,12 @@
         <artifactId>tomcat</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -62,13 +62,48 @@
             <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>
+                        <!--<_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.tomcat.cluster.wadi.builder,
+                            org.apache.geronimo.xbeans.tomcat.cluster.wadi,
+                            org.apache.geronimo.xbeans.tomcat.cluster.wadi.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/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/TomcatClusteringWADIConverter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/TomcatClusteringWADIConverter.java?rev=834946&r1=834945&r2=834946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/TomcatClusteringWADIConverter.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/TomcatClusteringWADIConverter.java
Wed Nov 11 16:23:49 2009
@@ -22,7 +22,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.geronimo.schema.ElementConverter;
-import org.apache.geronimo.xbeans.geronimo.GerTomcatClusteringWadiDocument;
+import org.apache.geronimo.xbeans.tomcat.cluster.wadi.GerTomcatClusteringWadiDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.xmlbeans.XmlCursor;
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder.java?rev=834946&r1=834945&r2=834946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder.java
Wed Nov 11 16:23:49 2009
@@ -55,8 +55,8 @@
 import org.apache.geronimo.tomcat.TomcatWebAppContext;
 import org.apache.geronimo.tomcat.cluster.ClusteredManagerRetriever;
 import org.apache.geronimo.tomcat.cluster.wadi.WADIClusteredValveRetriever;
-import org.apache.geronimo.xbeans.geronimo.GerTomcatClusteringWadiDocument;
-import org.apache.geronimo.xbeans.geronimo.GerTomcatClusteringWadiType;
+import org.apache.geronimo.xbeans.tomcat.cluster.wadi.GerTomcatClusteringWadiDocument;
+import org.apache.geronimo.xbeans.tomcat.cluster.wadi.GerTomcatClusteringWadiType;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerClusteringDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.xmlbeans.QNameSet;
@@ -77,7 +77,7 @@
             Collections.singletonMap(CLUSTERING_WADI_QNAME.getLocalPart(),
             new TomcatClusteringWADIConverter()));
     }
-    
+
     private final int defaultSweepInterval;
     private final int defaultSessionTimeout;
     private final int defaultNumPartitions;
@@ -85,7 +85,7 @@
     private final AbstractNameQuery defaultClusterName;
     private final Artifact artifactToRemoveFromEnvironment;
     private final Environment defaultEnvironment;
-    
+
     public WADITomcatClusteringBuilder(@ParamAttribute(name=GBEAN_ATTR_DFT_SWEEP_INTERVAL)
int defaultSweepInterval,
         @ParamAttribute(name=GBEAN_ATTR_DFT_SESSION_TIMEOUT) int defaultSessionTimeout,
         @ParamAttribute(name=GBEAN_ATTR_DFT_NUM_PARTITIONS) int defaultNumPartitions,
@@ -215,7 +215,7 @@
         Integer sessionTimeout = getSessionTimeout(webModuleData);
         boolean disableReplication = isDisableReplication(clustering);
         boolean deltaReplication = isDeltaReplication(clustering);
-        
+
         String contextPath = (String) webModuleData.getAttribute("contextPath");
         URI serviceSpaceName;
         try {
@@ -224,7 +224,7 @@
             AssertionError error = new AssertionError("contextPath [" + contextPath + "]
cannot be parsed as an URI.");
             throw (AssertionError) error.initCause(e);
         }
-        
+
         WADISessionManagerConfigInfo configInfo = new WADISessionManagerConfigInfo(serviceSpaceName,
                 sweepInterval,
                 numPartitions,
@@ -315,7 +315,7 @@
 
         return name;
     }
-    
+
     protected void addGBean(DeploymentContext moduleContext, GBeanData beanData) throws GBeanAlreadyExistsException
{
         moduleContext.addGBean(beanData);
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml?rev=834946&r1=834945&r2=834946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
Wed Nov 11 16:23:49 2009
@@ -18,7 +18,7 @@
     >
 
     <xb:namespace uri="http://geronimo.apache.org/xml/ns/tomcat-clustering-wadi-1.2">
-        <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
+        <xb:package>org.apache.geronimo.xbeans.tomcat.cluster.wadi</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>
 



Mime
View raw message