geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1059851 - in /geronimo/server/branches/3.0-M2: ./ plugins/j2ee/j2ee-deployer/src/main/history/ plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/ plugins/openejb/openejb/src/main/history/ plugins/tomcat/geronimo-tomca...
Date Mon, 17 Jan 2011 10:30:35 GMT
Author: xuhaihong
Date: Mon Jan 17 10:30:34 2011
New Revision: 1059851

URL: http://svn.apache.org/viewvc?rev=1059851&view=rev
Log:
use tomcat 7.0.6.0-SNAPSHOT

Modified:
    geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
    geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
    geronimo/server/branches/3.0-M2/pom.xml

Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1059851&r1=1059850&r2=1059851&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
Mon Jan 17 10:30:34 2011
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -76,4 +76,9 @@
         <artifactId>xbean-bundleutils</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java?rev=1059851&r1=1059850&r2=1059851&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
Mon Jan 17 10:30:34 2011
@@ -45,123 +45,158 @@ public class JspServletOptions implement
         tldLocationsCache = new GeronimoTldLocationsCache(context);
     }
 
+    @Override
     public boolean genStringAsCharArray() {
         return delegate.genStringAsCharArray();
     }
 
+    @Override
     public Map<String, TagLibraryInfo> getCache() {
         return delegate.getCache();
     }
 
+    @Override
     public int getCheckInterval() {
         return delegate.getCheckInterval();
     }
 
+    @Override
     public boolean getClassDebugInfo() {
         return delegate.getClassDebugInfo();
     }
 
+    @Override
     public String getClassPath() {
         return delegate.getClassPath();
     }
 
+    @Override
     public String getCompiler() {
         return delegate.getCompiler();
     }
 
+    @Override
     public String getCompilerClassName() {
         return delegate.getCompilerClassName();
     }
 
+    @Override
     public String getCompilerSourceVM() {
         return delegate.getCompilerSourceVM();
     }
 
+    @Override
     public String getCompilerTargetVM() {
         return delegate.getCompilerTargetVM();
     }
 
+    @Override
     public boolean getDevelopment() {
         return delegate.getDevelopment();
     }
 
+    @Override
     public boolean getDisplaySourceFragment() {
         return delegate.getDisplaySourceFragment();
     }
 
+    @Override
     public boolean getErrorOnUseBeanInvalidClassAttribute() {
         return delegate.getErrorOnUseBeanInvalidClassAttribute();
     }
 
+    @Override
     public boolean getFork() {
         return delegate.getFork();
     }
 
+    @Override
     public String getIeClassId() {
         return delegate.getIeClassId();
     }
 
+    @Override
     public String getJavaEncoding() {
         return delegate.getJavaEncoding();
     }
 
+    @Override
     public JspConfig getJspConfig() {
         return delegate.getJspConfig();
     }
 
+    @Override
     public boolean getKeepGenerated() {
         return delegate.getKeepGenerated();
     }
 
+    @Override
     public boolean getMappedFile() {
         return delegate.getMappedFile();
     }
 
+    @Override
     public int getModificationTestInterval() {
         return delegate.getModificationTestInterval();
     }
 
+    @Override
     public File getScratchDir() {
         return delegate.getScratchDir();
     }
 
+    @Override
     public TagPluginManager getTagPluginManager() {
         return delegate.getTagPluginManager();
     }
 
+    @Override
     public TldLocationsCache getTldLocationsCache() {
         return tldLocationsCache;
     }
 
+    @Override
     public boolean getTrimSpaces() {
         return delegate.getTrimSpaces();
     }
 
+    @Override
     public boolean isCaching() {
         return delegate.isCaching();
     }
 
+    @Override
     public boolean isPoolingEnabled() {
         return delegate.isPoolingEnabled();
     }
 
+    @Override
     public boolean isSmapDumped() {
         return delegate.isSmapDumped();
     }
 
+    @Override
     public boolean isSmapSuppressed() {
         return delegate.isSmapSuppressed();
     }
 
+    @Override
     public boolean isXpoweredBy() {
         return delegate.isXpoweredBy();
     }
 
+    @Override
     public boolean getRecompileOnFail() {
         return delegate.getRecompileOnFail();
     }
 
+    @Override
     public int getMaxLoadedJsps() {
         return delegate.getMaxLoadedJsps();
     }
+
+    @Override
+    public int getJspIdleTimeout() {
+        return delegate.getJspIdleTimeout();
+    }
 }

Modified: geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1059851&r1=1059850&r2=1059851&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
Mon Jan 17 10:30:34 2011
@@ -7,6 +7,16 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.bval</groupId>
+        <artifactId>bval-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.bval</groupId>
+        <artifactId>bval-jsr303</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>
@@ -137,6 +147,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java?rev=1059851&r1=1059850&r2=1059851&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
Mon Jan 17 10:30:34 2011
@@ -18,9 +18,6 @@
 
 package org.apache.geronimo.tomcat.stats;
 
-import java.util.Iterator;
-import java.util.Set;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
@@ -60,13 +57,9 @@ public class ModuleStats {
             log.error("Error - " + ex.toString());
         }
         // Query Session Managers
-        Set<ObjectInstance> set = mBeanServer.queryMBeans(mgrName, null);
-        Iterator<ObjectInstance> iterator = set.iterator();
-        ObjectName objectName;
-        while (iterator.hasNext()) {
-            ObjectInstance oi = iterator.next();
-            objectName = oi.getObjectName();
-            if (objectName.getKeyProperty("path").indexOf(context.getPath()) > -1) {
+        for (ObjectInstance oi : mBeanServer.queryMBeans(mgrName, null)) {
+            ObjectName objectName = oi.getObjectName();
+            if (objectName.getKeyProperty("context").indexOf(context.getPath()) > -1)
{
                 mgrName = objectName;
                 break;
 

Modified: geronimo/server/branches/3.0-M2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/pom.xml?rev=1059851&r1=1059850&r2=1059851&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/pom.xml Mon Jan 17 10:30:34 2011
@@ -66,7 +66,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>7.0.0.2-SNAPSHOT</tomcatVersion>
+        <tomcatVersion>7.0.6.0-SNAPSHOT</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>3.2-SNAPSHOT</openejbVersion>



Mime
View raw message