costin 02/04/10 22:46:51
Modified: jk/java/org/apache/jk/apr AprImpl.java
jk/java/org/apache/jk/common ChannelUn.java
jk/java/org/apache/jk/server JkMain.java
Log:
Update the name, few fixes to get the substitution working
Revision Changes Path
1.5 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AprImpl.java 10 Apr 2002 23:53:11 -0000 1.4
+++ AprImpl.java 11 Apr 2002 05:46:51 -0000 1.5
@@ -80,7 +80,7 @@
// Use load()
try {
System.loadLibrary( "apr" );
- System.loadLibrary( "jni_connect" );
+ System.loadLibrary( "jkjni" );
} catch( Throwable ex ) {
ok=false;
ex.printStackTrace();
1.9 +3 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChannelUn.java 10 Apr 2002 23:53:11 -0000 1.8
+++ ChannelUn.java 11 Apr 2002 05:46:51 -0000 1.9
@@ -152,8 +152,10 @@
}
unixListenSocket=apr.unSocketListen( gPool, file, 10 );
if (unixListenSocket<0)
- throw(new IOException("Cannot create listening socket"));
+ throw(new IOException("Cannot create listening socket " + file));
+ log.info("Listening on unix socket: " + file );
+
// Run a thread that will accept connections.
tp.start();
AprAcceptor acceptAjp=new AprAcceptor( this );
1.16 +8 -5
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
Index: JkMain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JkMain.java 10 Apr 2002 23:53:11 -0000 1.15
+++ JkMain.java 11 Apr 2002 05:46:51 -0000 1.16
@@ -102,9 +102,8 @@
public void setProperty( String n, String v ) {
if( "jkHome".equals( n ) ) {
setJkHome( v );
- } else {
- props.put( n, v );
- }
+ }
+ props.put( n, v );
}
/**
@@ -217,19 +216,23 @@
up the clean get/set
*/
public void setProperty( Object target, String name, String val ) {
+ if( val!=null )
+ val=IntrospectionUtils.replaceProperties( val, props );
if( log.isDebugEnabled())
log.debug( "setProperty " + target + " " + name + "=" + val );
+
IntrospectionUtils.setProperty( target, name, val );
}
/*
* Set a handler property
*/
- public void setProperty( String handlerN, String name, String val ) {
+ public void setPropertyString( String handlerN, String name, String val ) {
if( log.isDebugEnabled() )
log.debug( "setProperty " + handlerN + " " + name + "=" + val );
Object target=wEnv.getHandler( handlerN );
- IntrospectionUtils.setProperty( target, name, val );
+
+ setProperty( target, name, val );
}
public long getStartTime() {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
