geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r881288 - in /geronimo/server/trunk: ./ plugins/connector-1_6/transaction-1_6/src/main/history/ plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/ plugins/jetty7/geronimo-je...
Date Tue, 17 Nov 2009 13:48:04 GMT
Author: rickmcguire
Date: Tue Nov 17 13:48:04 2009
New Revision: 881288

URL: http://svn.apache.org/viewvc?rev=881288&view=rev
Log:
some jetty plugin cleanup

Modified:
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml
    geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
Tue Nov 17 13:48:04 2009
@@ -47,11 +47,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.howl</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
Tue Nov 17 13:48:04 2009
@@ -48,8 +48,8 @@
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.schema.NamespaceElementConverter;
 import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.xbeans.geronimo.GerClusteringWadiDocument;
-import org.apache.geronimo.xbeans.geronimo.GerClusteringWadiType;
+import org.apache.geronimo.xbeans.jetty7.cluster.wadi.GerClusteringWadiDocument;
+import org.apache.geronimo.xbeans.jetty7.cluster.wadi.GerClusteringWadiType;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerClusteringDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.xmlbeans.QNameSet;
@@ -70,7 +70,7 @@
             Collections.singletonMap(CLUSTERING_WADI_QNAME.getLocalPart(),
             new NamespaceElementConverter(CLUSTERING_WADI_QNAME.getNamespaceURI())));
     }
-    
+
     private final int defaultSweepInterval;
     private final int defaultNumPartitions;
     private final AbstractNameQuery defaultBackingStrategyFactoryName;
@@ -129,7 +129,7 @@
             throw new DeploymentException("Could not locate web module gbean in web app configuration",
e);
         }
     }
-    
+
     protected AbstractNameQuery createJettyWebAppContextNameQuery(DeploymentContext moduleContext)
{
         String name = moduleContext.getModuleName().getNameProperty(Jsr77Naming.J2EE_NAME);
         return new AbstractNameQuery(null,
@@ -176,14 +176,14 @@
 
         return name;
     }
-    
+
     protected void setConfigInfo(GerClusteringWadiType clustering, GBeanData webModuleData,
GBeanData beanData) {
         int sweepInterval = getSweepInterval(clustering);
         int numPartitions = getNumberOfPartitions(clustering);
         Integer sessionTimeout = getSessionTimeout(webModuleData);
         boolean disableReplication = isDisableReplication(clustering);
         boolean deltaReplication = isDeltaReplication(clustering);
-        
+
         String contextPath = (String) webModuleData.getAttribute("contextPath");
         URI serviceSpaceName;
         try {
@@ -191,7 +191,7 @@
         } catch (URISyntaxException e) {
             throw (AssertionError) new AssertionError("contextPath [" + contextPath + "]
cannot be parsed as an URI.").initCause(e);
         }
-        
+
         WADISessionManagerConfigInfo configInfo = new WADISessionManagerConfigInfo(serviceSpaceName,
                 sweepInterval,
                 numPartitions,

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml Tue Nov 17 13:48:04 2009
@@ -80,6 +80,11 @@
             <version>${version}</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
+          <version>6.1.15</version>
+        </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-clustering-builder-wadi/src/main/history/dependencies.xml
Tue Nov 17 13:48:04 2009
@@ -6,17 +6,17 @@
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jetty7-clustering-wadi</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jetty7-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jetty7-clustering-builder-wadi</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
Tue Nov 17 13:48:04 2009
@@ -56,4 +56,9 @@
         <artifactId>jetty-xml</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/history/dependencies.xml
Tue Nov 17 13:48:04 2009
@@ -6,22 +6,27 @@
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
+    <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer-1_6</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jetty7</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jetty7-builder</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml Tue Nov
17 13:48:04 2009
@@ -91,4 +91,9 @@
         <artifactId>jetty-xml</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=881288&r1=881287&r2=881288&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Nov 17 13:48:04 2009
@@ -84,7 +84,7 @@
         <axiomVersion>1.2.8</axiomVersion>
         <springVersion>2.5.6</springVersion>
         <xbeanVersion>3.6</xbeanVersion>
-        <jetty>jetty7</jetty>
+        <jetty>jetty8</jetty>
 
         <connectorSuffix>-1_6</connectorSuffix>
         <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>



Mime
View raw message