Author: xuhaihong
Date: Mon Jan 17 10:38:23 2011
New Revision: 1059854
URL: http://svn.apache.org/viewvc?rev=1059854&view=rev
Log:
Use Tomcat 7.0.6.0-SNAPSHOT
Modified:
geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java?rev=1059854&r1=1059853&r2=1059854&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
Mon Jan 17 10:38:23 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/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java?rev=1059854&r1=1059853&r2=1059854&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java
Mon Jan 17 10:38:23 2011
@@ -20,9 +20,7 @@ import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.zip.ZipEntry;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -43,7 +41,7 @@ import org.slf4j.LoggerFactory;
public class TldRegistration implements GBeanLifecycle {
private static final Logger LOGGER = LoggerFactory.getLogger(TldRegistration.class);
-
+
private final Bundle bundle;
private final String packageNameList;
@@ -52,7 +50,7 @@ public class TldRegistration implements
this.bundle = bundle;
this.packageNameList = packageNameList;
}
-
+
public void doStart() throws Exception {
ServiceReference reference = bundle.getBundleContext().getServiceReference(PackageAdmin.class.getName());
PackageAdmin packageAdmin = (PackageAdmin) bundle.getBundleContext().getService(reference);
@@ -62,7 +60,7 @@ public class TldRegistration implements
bundle.getBundleContext().ungetService(reference);
}
}
-
+
private void registerTlds(PackageAdmin packageAdmin) throws Exception {
String[] packageNames = packageNameList.split(",");
for (String packageName : packageNames) {
@@ -71,7 +69,7 @@ public class TldRegistration implements
LOGGER.warn("Package {} is not currently exported by any active bundle",
packageName);
} else {
Bundle exportingBundle = exportedPackage.getExportingBundle();
-
+
BundleResourceFinder resourceFinder = new BundleResourceFinder(packageAdmin,
exportingBundle, "META-INF/", ".tld");
TldResourceFinderCallback callback = new TldResourceFinderCallback();
resourceFinder.find(callback);
@@ -79,26 +77,26 @@ public class TldRegistration implements
exportingBundle.getBundleContext().registerService(TldProvider.class.getName(),
callback, null);
}
}
- }
+ }
}
-
+
public void doFail() {
}
public void doStop() throws Exception {
}
-
+
private static class TldResourceFinderCallback implements ResourceFinderCallback, TldProvider
{
private final List<TldProvider.TldEntry> tlds = new ArrayList<TldProvider.TldEntry>();
private TldResourceFinderCallback() {
}
-
+
public Collection<TldProvider.TldEntry> getTlds() {
return tlds;
}
-
+
public boolean foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception
{
LOGGER.debug("Found {} TLD in bundle {}", url, bundle);
tlds.add(new TldProvider.TldEntry(bundle, url));
@@ -112,7 +110,7 @@ public class TldRegistration implements
tlds.add(new TldProvider.TldEntry(bundle, url, jarURL));
return false;
}
-
+
}
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java?rev=1059854&r1=1059853&r2=1059854&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/stats/ModuleStats.java
Mon Jan 17 10:38:23 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1059854&r1=1059853&r2=1059854&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Jan 17 10:38:23 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>
|