jaliya 2005/03/01 22:09:05
Modified: sandesha/interop build.xml server-config.wsdd
sandesha maven.xml project.xml
sandesha/src/org/apache/sandesha/storage/queue
SandeshaQueue.java
Added: sandesha/config commons-logging.properties log4j.properties
Log:
Added the configuration properties
Revision Changes Path
1.2 +1 -1 ws-fx/sandesha/interop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2 Mar 2005 03:47:04 -0000 1.1
+++ build.xml 2 Mar 2005 06:09:05 -0000 1.2
@@ -54,7 +54,7 @@
<property name="dir.doc" value="..\doc"/>
<property name="dir.dist" value="..\dist"/>
- <property name="dir.libs" value="..\lib"/>
+ <property name="dir.libs" value="..\target\lib"/>
<property name="dir.src" value="..\src"/>
<property name="dir.samples" value="..\samples"/>
<property name="dir.test" value="..\test"/>
1.2 +2 -2 ws-fx/sandesha/interop/server-config.wsdd
Index: server-config.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/server-config.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server-config.wsdd 2 Mar 2005 03:47:04 -0000 1.1
+++ server-config.wsdd 2 Mar 2005 06:09:05 -0000 1.2
@@ -3,9 +3,9 @@
<globalConfiguration>
<parameter name="adminPassword" value="admin"/>
<parameter name="disablePrettyXML" value="true"/>
- <parameter name="sendMultiRefs" value="true"/>
- <parameter name="sendXsiTypes" value="true"/>
<parameter name="attachments.implementation"
value="org.apache.axis.attachments.AttachmentsImpl"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
<requestFlow>
<handler type="java:org.apache.axis.handlers.JWSHandler">
1.3 +19 -2 ws-fx/sandesha/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 2 Mar 2005 03:16:31 -0000 1.2
+++ maven.xml 2 Mar 2005 06:09:05 -0000 1.3
@@ -13,14 +13,31 @@
<path refid="maven.dependency.classpath"/>
</path>
</goal>
+
+ <preGoal name="java:compile">
+ <copy file="config/sandesha.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/log4j.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/commons-logging.properties"
todir="${maven.build.dir}/classes"/>
+ </preGoal>
+
+ <preGoal name="interop:compile">
+ <copy file="config/sandesha.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/log4j.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/commons-logging.properties"
todir="${maven.build.dir}/classes"/>
+ </preGoal>
<postGoal name="jar">
<ant:mkdir dir="${basedir}/target/lib"/>
<deploy:copy-deps todir="${basedir}/target/lib"/>
+ <copy file="lib/xerces.jar" todir="${basedir}/target/lib"/>
</postGoal>
+
+ <preGoal name="interop:compile">
+ <ant:mkdir dir="${basedir}/target/interop-classes"/>
+ </preGoal>
<goal name="interop:compile" prereqs="java:compile">
- <ant:javac srcdir="interop" destdir="${maven.build.dest}"
includes="**/*.java"
+ <ant:javac srcdir="interop"
destdir="${maven.build.dir}/interop-classes" includes="**/*.java"
debug="${maven.compile.debug}"
optimize="${optimize}"
deprecation="${maven.compile.deprecation}">
1.3 +11 -0 ws-fx/sandesha/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 2 Mar 2005 03:16:31 -0000 1.2
+++ project.xml 2 Mar 2005 06:09:05 -0000 1.3
@@ -231,6 +231,17 @@
<module>true</module>
</properties>
</dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+
</dependencies>
1.9 +0 -1
ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java
Index: SandeshaQueue.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SandeshaQueue.java 2 Mar 2005 03:16:31 -0000 1.8
+++ SandeshaQueue.java 2 Mar 2005 06:09:05 -0000 1.9
@@ -231,7 +231,6 @@
throw new QueueException(Constants.Queue.SEQUENCE_ID_NULL);
synchronized (outgoingMap) {
- System.out.println("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
"+sequenceId);
OutgoingSequence rsh = new OutgoingSequence(sequenceId);
outgoingMap.put(sequenceId, rsh);
}
1.1 ws-fx/sandesha/config/commons-logging.properties
Index: commons-logging.properties
===================================================================
# This is the logging properties that goes to the war, there are two logging
conf kept at the
# svn, one for developement (one at src/test-resources) and other for
producation
# Uncomment the next line to disable all logging.
#org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
# Uncomment the next line to enable the simple log based logging
#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
# Uncomment the next line to enable log4j based logging
org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
1.1 ws-fx/sandesha/config/log4j.properties
Index: log4j.properties
===================================================================
## Use two appenders, one to log to console, another to log to a file
# This is the logging properties that goes to the war, there are two logging
conf kept at the
# svn, one for developement (one at src/test-resources) and other for
producation
log4j.rootCategory=ERROR, LOGFILE
#### appender writes to a file
log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
log4j.appender.LOGFILE.File=axis.log
# Control the maximum log file size
log4j.appender.LOGFILE.MaxFileSize=10000KB
# Archive log files (one backup file here)
log4j.appender.LOGFILE.MaxBackupIndex=100
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.LOGFILE.layout.ConversionPattern=%6r %5p [%t] (%F:%L) - %m%n
