On Dec 17, 2009, at 12:56 AM, Ivan wrote:
2009/12/17 David Jencks <[email protected]>
Could you explain a little more why the dynamic import is needed?
Tomcat often claims that jasper and tomcat are separate projects,
and other web apps don't need to be imported into tomcat.
I mentioned in another topic about this, please refer to the class
org.apache.catalina.core.JasperListener.
I found your other topic and just commented on it... to be redundant,
as I said there I think we don't need to use JasperListener, we should
be able to initialize jasper with a gbean.
thanks
david jencks
Also, its better to change the tomcat-archetype for pom changes, and
to regenerate the project if you are picking up tomcat fixes. This
is a small change in the tomcat class but it is very important to
get the pom change into the archetype so it isn't lost the next time
the tomcat-parent is generated
Got it !
.
thanks
david jencks
On Dec 16, 2009, at 9:10 PM, [email protected] wrote:
Author: xuhaihong
Date: Thu Dec 17 05:10:13 2009
New Revision: 891539
URL: http://svn.apache.org/viewvc?rev=891539&view=rev
Log:
1. Add dynamical import for Japser classes, maybe there is a better
way ?
2. Import javax.servlet.resources packages for schema files
3. Merge the changes in Tomcat trunk to set the default value for
algorithm
Modified:
geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/
org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml?rev=891539&r1=891538&r2=891539&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml Thu
Dec 17 05:10:13 2009
@@ -69,7 +69,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions></instructions>
+ <instructions>
+ <DynamicImport-Package>org.apache.jasper.*</
DynamicImport-Package>
+ <Import-Package>javax.servlet.resources,*</
Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/
main/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=891539&r1=891538&r2=891539&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/
java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/
java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Dec 17
05:10:13 2009
@@ -23,6 +23,8 @@
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
+import javax.net.ssl.KeyManagerFactory;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -453,7 +455,7 @@
// -------------------- SSL related properties
--------------------
- private String algorithm = "SunX509";
+ private String algorithm =
KeyManagerFactory.getDefaultAlgorithm();;
public String getAlgorithm() { return algorithm;}
public void setAlgorithm(String s ) { this.algorithm = s;}
--
Ivan
