Author: ips
Date: Fri Mar 25 12:16:21 2005
New Revision: 159057
URL: http://svn.apache.org/viewcvs?view=rev&rev=159057
Log: (empty)
Added:
incubator/muse/trunk/src/webapp/WEB-INF/classes/
incubator/muse/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
incubator/muse/trunk/src/webapp/WEB-INF/classes/log4j.properties
Modified:
incubator/muse/trunk/maven.xml
incubator/muse/trunk/project.properties
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
incubator/muse/trunk/src/webapp/WEB-INF/server-config.wsdd
incubator/muse/trunk/src/webapp/WEB-INF/web.xml
Modified: incubator/muse/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/maven.xml?view=diff&r1=159056&r2=159057
==============================================================================
--- incubator/muse/trunk/maven.xml (original)
+++ incubator/muse/trunk/maven.xml Fri Mar 25 12:16:21 2005
@@ -36,33 +36,7 @@
<postGoal name="test:test">
<j:set var="maven.test.skip" value="true" />
</postGoal>
-
- <goal name="prep" prereqs="java:prepare-filesystem" />
- <goal name="compile" prereqs="java:compile" />
- <goal name="webapp" prereqs="war:webapp" />
-
- <!-- ================================================================== -->
- <!-- J A V A : J A R -R E S O U R C E S P O S T - G O A L -->
- <!-- ================================================================== -->
- <!-- After compiling and copying jar resources, ensure generated code -->
- <!-- has been created and compiled. Do this post java:jar-resources -->
- <!-- because we need the resource bundles in place and we need to do -->
- <!-- this before testing begins. -->
- <!-- ================================================================== -->
- <postGoal name="java:jar-resources">
- <mkdir dir="${maven.build.dir}" />
- <copy file="${src.config.wsdd}" tofile="${target.config.wsdd}"
overwrite="true" verbose="true" />
- <path id="muse.classpath.id">
- <pathelement location="${maven.build.dest}" />
- <path refid="maven.dependency.classpath" />
- </path>
- <copy todir="${maven.build.dir}/test-classes" overwrite="true"
verbose="true">
- <fileset dir="${maven.src.dir}/test">
- <include name="*.wsdd" />
- </fileset>
- </copy>
- </postGoal>
-
+
<!-- ================================================================== -->
<!-- W E B S I T E G O A L
-->
<!-- ================================================================== -->
@@ -120,37 +94,34 @@
<!-- W A R : W E B A P P -->
<!-- P O S T - G O A L -->
<!-- ================================================================== -->
- <!-- Store Muse classes in WEB-INF/lib instead of WEB-INF/classes -->
- <!-- ================================================================== -->
- <postGoal name="war:webapp">
+ <postGoal name="war:webapp">
- <!-- Copy spec WSDLs into webapp docroot -->
- <property name="spec.wsdl.deploy.dir"
location="${maven.war.webapp.dir}/spec" />
- <mkdir dir="${spec.wsdl.deploy.dir}" />
- <copy todir="${spec.wsdl.deploy.dir}">
- <fileset dir="${maven.src.dir}/wsdl/spec" />
- </copy>
-
- <copy file="${target.config.wsdd}" todir="${maven.war.webapp.dir}/WEB-INF"
overwrite="true" verbose="true" />
-
- <!-- Clear out WEB-INF/classes/, since we're going to use a jar in
WEB-INF/lib/ instead -->
- <delete dir="${maven.war.webapp.dir}/WEB-INF/classes" />
- <mkdir dir="${maven.war.webapp.dir}/WEB-INF/classes" />
-
- <!-- Copy log4j config file into docroot to make it easier for users to
edit -->
- <copy file="${maven.build.dest}/log4j.properties"
todir="${maven.war.webapp.dir}/WEB-INF/classes" />
-
+ <!-- Delete the Muse classes that war:webapp copied into WEB-INF/classes/.
-->
+ <delete><fileset dir="${maven.war.webapp.dir}/WEB-INF/classes"
excludes="*.*, wsdl" /></delete>
+
+ <!-- Delete empty WEB-INF/tld/ dir that war plugin created -->
+ <delete dir="${maven.war.webapp.dir}/WEB-INF/tld" />
+
+ <!-- Build Muse jar and copy it into WEB-INF/lib/. -->
<j:set var="maven.test.skip" value="true" />
- <attainGoal name="jar" />
+ <attainGoal name="jar:jar" />
<copy file="${maven.build.dir}/${maven.final.name}.jar"
todir="${maven.war.webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true" />
- <attainGoal name="dep-license-files" />
+ <!-- Copy spec WSDLs into spec/ subdir of webapp docroot. -->
+ <mkdir dir="${spec.wsdl.dest.dir}" />
+ <copy todir="${spec.wsdl.dest.dir}">
+ <fileset dir="${wsdm.wsdl.src.dir}" />
+ </copy>
- <!-- Delete empty WEB-INF/tld/ dir that war plugin created -->
- <delete dir="${maven.war.webapp.dir}/WEB-INF/tld" />
+ <attainGoal name="dep-license-files" />
</postGoal>
+ <goal name="deploy">
+ <mkdir dir="${env.CATALINA_HOME}/webapps/${webapp.name}/WEB-INF/lib" />
+ <copy file="${maven.build.dir}/${maven.final.name}.jar"
todir="${env.CATALINA_HOME}/webapps/${webapp.name}/WEB-INF/lib"
overwrite="true" verbose="true" />
+ </goal>
+
<!-- ================================================================== -->
<!-- D I S T : P R E P A R E - B I N - F I L E S Y S T E M -->
<!-- P O S T - G O A L -->
@@ -216,54 +187,6 @@
<fileset dir="${maven.dist.dir}"><include name="*.tar.gz" /></fileset>
</delete>
</postGoal>
-
- <!-- ================================================================== -->
- <!-- C M 2 : D I S T G O A L -->
- <!-- ================================================================== -->
- <!-- Build distribution on CM2 build server. -->
- <!-- For use with the CM2 build system. -->
- <!-- ================================================================== -->
- <goal name="cm2:dist" prereqs="clean, cm2:checkout">
- <maven:snapshot project="${pom}" />
- <j:set var="maven.final.name"
value="${snapshotSignature}-${pom.currentVersion}" />
- <attainGoal name="dist:build" />
- </goal>
-
- <!-- ================================================================== -->
- <!-- C M 2 : C H E C K O U T G O A L -->
- <!-- ================================================================== -->
- <!-- Checkout project from CVS with Date label on CM2 build server. -->
- <!-- For use with the CM2 build system. -->
- <!-- ================================================================== -->
- <goal name="cm2:checkout">
- <property environment="env" />
- <property file="${basedir}/internal-build.properties" />
- <!-- this sets the Label prop -->
- <property file="${cm2.config.file}" />
- <cvs command="checkout -P -A -D ${Label}"
- cvsRoot=":pserver:${env.CVS_USR}:[EMAIL PROTECTED]:/cvs"
- package="${cm2.project.name}"
- dest="${basedir}/.."
- quiet="${cvs.quiet}" />
- </goal>
-
- <!-- ================================================================== -->
- <!-- CC : C H E C K O U T G O A L -->
- <!-- ================================================================== -->
- <!-- Checkout project from CVS. -->
- <!-- Used by cruisecontrol. -->
- <!-- ================================================================== -->
- <goal name="cc:checkout">
- <mkdir dir="${maven.build.dir}/test-reports"/>
- <property environment="env" />
- <!-- property file="${basedir}/internal-build.properties" / -->
- <cvs command="update -d -P -C"
- cvsRoot=":pserver:${env.CVS_USR}:[EMAIL PROTECTED]:/cvs"
- package="ws-rp"
- dest=".."
- quiet="no"
- />
- </goal>
<!--
<preGoal name="xdoc:register-reports">
@@ -335,6 +258,10 @@
classpathref="maven.dependency.classpath"
processor="trax"/>
</goal>
+
+ <goal name="prep" prereqs="java:prepare-filesystem" />
+ <goal name="compile" prereqs="java:compile" />
+ <goal name="webapp" prereqs="war:webapp" />
<!-- ================================================================== -->
<!-- D E P - L I C E N S E - F I L E S G O A L -->
Modified: incubator/muse/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/project.properties?view=diff&r1=159056&r2=159057
==============================================================================
--- incubator/muse/trunk/project.properties (original)
+++ incubator/muse/trunk/project.properties Fri Mar 25 12:16:21 2005
@@ -49,15 +49,6 @@
# MAVEN.XML GOALS
###################
-site.dest.dir = ${basedir}/../site
-muse.service.wsdl.dir = ${maven.src.dir}/wsdl/muse
-muse.spec.wsdl.dir = ${maven.src.dir}/wsdl/spec
-
-wsnt.submgr.wsdl.file = ${muse.service.wsdl.dir}/subscription-manager.wsdl
-registry.wsdl.file = ${muse.service.wsdl.dir}/registry.wsdl
-
-src.config.wsdd = ${maven.src.dir}/webapp/WEB-INF/server-config.wsdd
-target.config.wsdd = ${maven.build.dir}/server-config.wsdd
-
-wsrf.disk.types.src.dir = ${maven.build.dir}/generated/src
-wsrf.disk.types.classes.dir = ${maven.build.dir}/generated/classes
+site.dest.dir = ../site
+wsdm.wsdl.src.dir = wsdm-xbeans/src/wsdl
+spec.wsdl.dest.dir = ${maven.war.webapp.dir}/spec
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java?view=diff&r1=159056&r2=159057
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
Fri Mar 25 12:16:21 2005
@@ -18,6 +18,7 @@
import org.apache.ws.muws.v1_0.capability.IdentityCapability;
import
org.apache.ws.muws.v1_0.capability.ManageabilityCharacteristicsCapability;
import org.apache.ws.muws.v1_0.capability.OperationalStatusCapability;
+import org.apache.ws.util.jndi.XmlBeanJndiUtils;
import org.apache.ws.util.test.axis.AbstractOneAxisTestCase;
import org.apache.xmlbeans.XmlAnyURI;
import org.apache.xmlbeans.XmlObject;
@@ -32,20 +33,42 @@
public abstract class AbstractWsdmInteropTestCase extends
AbstractOneAxisTestCase
{
+ private static final boolean RUN_AXIS_SERVER = Boolean.valueOf(
System.getProperty( "runAxis", "true" ) ).booleanValue();
+
+ public AbstractWsdmInteropTestCase()
+ {
+ super( RUN_AXIS_SERVER );
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if ( RUN_AXIS_SERVER )
+ {
+ //init jndi from config
+ XmlBeanJndiUtils.initializeFromInputStream(
+
Thread.currentThread().getContextClassLoader().getResourceAsStream(
+ XmlBeanJndiUtils.JNDI_CONFIG_FILENAME ) );
+ }
+ }
+
protected void performMuwsIdentityCharacteristicsAct( ResourceStub
resource ) throws FaultException
{
XmlObject[] idElems = resource.getResourceProperty(
IdentityCapability.PROP_NAME_RESOURCE_ID );
assertEquals( 1, idElems.length );
assertTrue( idElems[0] instanceof XmlAnyURI );
- XmlObject[] capabilityElems = resource.getResourceProperty(
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
+ XmlObject[] capabilityElems = resource.getResourceProperty(
+
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
assertContainsURI( capabilityElems, IdentityCapability.URI );
}
protected void performMuwsStatusAct( ResourceStub resource ) throws
FaultException
{
- XmlObject[] capabilityElems = resource.getResourceProperty(
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
+ XmlObject[] capabilityElems = resource.getResourceProperty(
+
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
assertContainsURI( capabilityElems, OperationalStatusCapability.URI );
- XmlObject[] statusElems = resource.getResourceProperty(
OperationalStatusCapability.PROP_NAME_OPERATIONAL_STATUS );
+ XmlObject[] statusElems = resource.getResourceProperty(
+ OperationalStatusCapability.PROP_NAME_OPERATIONAL_STATUS );
assertEquals( 1, statusElems.length );
assertTrue( statusElems[0] instanceof
OperationalStatusDocument.OperationalStatus );
}
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java?view=diff&r1=159056&r2=159057
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
Fri Mar 25 12:16:21 2005
@@ -38,6 +38,7 @@
public ServerMgmtTestCase() throws Exception
{
EndpointReferenceDocument serverEprDoc = getEndpointReference( new
URL( SERVER_EPR ) );
+ System.out.println( "*** Using IPMI Server EPR:" );
m_resource = new ResourceStub( serverEprDoc.getEndpointReference() );
}
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java?view=diff&r1=159056&r2=159057
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java
Fri Mar 25 12:16:21 2005
@@ -38,6 +38,7 @@
public SmallDeviceMgmtTestCase() throws Exception
{
EndpointReferenceDocument smallDeviceEprDoc = getEndpointReference(
new URL( SERVER_EPR ) );
+ System.out.println( "*** Using Small Device EPR:" );
m_resource = new ResourceStub(
smallDeviceEprDoc.getEndpointReference() );
}
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java?view=diff&r1=159056&r2=159057
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
Fri Mar 25 12:16:21 2005
@@ -48,6 +48,7 @@
public WebServicesMgmtTestCase() throws Exception
{
EndpointReferenceDocument weatherStationEprDoc = getEndpointReference(
new URL( SERVER_EPR ) );
+ System.out.println( "*** Using Weather Station EPR:" );
m_resource = new ResourceStub(
weatherStationEprDoc.getEndpointReference() );
}
Added: incubator/muse/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/webapp/WEB-INF/classes/jndi-config.xml?view=auto&rev=159057
==============================================================================
--- incubator/muse/trunk/src/webapp/WEB-INF/classes/jndi-config.xml (added)
+++ incubator/muse/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Fri Mar 25
12:16:21 2005
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+
+<jndiConfig xmlns="http://www.apache.org/wsfx/wsrf/jndi/config";>
+
+ <global>
+
+ <resource name="DefaultParameters"
type="org.apache.ws.util.jndi.DefaultParameters">
+ <resourceParams>
+ <parameter>
+ <name>factory</name>
+ <value>org.apache.ws.util.jndi.BeanFactory</value>
+ </parameter>
+ <parameter>
+ <name>resourceKeyClassName</name>
+ <value>org.apache.ws.resource.impl.SimpleTypeResourceKey</value>
+ </parameter>
+ </resourceParams>
+ </resource>
+
+ <resource name="timer/ContainerTimer"
type="org.apache.ws.util.timer.TimerManagerImpl">
+ <resourceParams>
+ <parameter>
+ <name>factory</name>
+ <value>org.apache.ws.util.jndi.BeanFactory</value>
+ </parameter>
+ </resourceParams>
+ </resource>
+
+ <resource name="topic/eval/simple"
type="org.apache.ws.notification.topics.impl.SimpleTopicExpressionEvaluator">
+ <resourceParams>
+ <parameter>
+ <name>factory</name>
+ <value>org.apache.ws.util.jndi.BeanFactory</value>
+ </parameter>
+ </resourceParams>
+ </resource>
+
+ <resource name="topic/ContainerTopicExpressionEngine"
type="org.apache.ws.notification.topics.impl.TopicExpressionEngineImpl">
+ <resourceParams>
+ <parameter>
+ <name>factory</name>
+ <value>org.apache.ws.util.jndi.BeanFactory</value>
+ </parameter>
+ </resourceParams>
+ </resource>
+
+ </global>
+
+ <service name="SubscriptionManager">
+ <resource name="home"
type="org.apache.ws.notification.base.service.SubscriptionHome">
+ <resourceParams>
+ <parameter>
+ <name>serviceClassName</name>
+
<value>org.apache.ws.notification.impl.service.SubscriptionService</value>
+ </parameter>
+ <parameter>
+ <name>resourceClassName</name>
+
<value>org.apache.ws.notification.base.service.SubscriptionResource</value>
+ </parameter>
+ <parameter>
+ <name>wsdlTargetNamespace</name>
+
<value>http://ws.apache.org/notification/base/service/SubscriptionManager</value>
+ </parameter>
+ <parameter>
+ <name>resourceKeyName</name>
+
<value>{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceID</value>
+ </parameter>
+ </resourceParams>
+ </resource>
+ </service>
+
+</jndiConfig>
+
Added: incubator/muse/trunk/src/webapp/WEB-INF/classes/log4j.properties
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/webapp/WEB-INF/classes/log4j.properties?view=auto&rev=159057
==============================================================================
--- incubator/muse/trunk/src/webapp/WEB-INF/classes/log4j.properties (added)
+++ incubator/muse/trunk/src/webapp/WEB-INF/classes/log4j.properties Fri Mar 25
12:16:21 2005
@@ -0,0 +1,87 @@
+
+#------------------------------------#
+# Syntax for log-level definitions #
+#------------------------------------#
+#
+# log4j.<logger_name>=<priority_level>, <appender_name>
[,<appender_name>...]
+#
+# -or-
+#
+# log4j.<logger_name>=INHERITED
+#
+# NOTE: Appenders are defined at the end of this configuration file.
+#
+#-------------------------------------------------------------------------------#
+# Root logger's log-level (affects all classes within the JVM that use Log4J)
#
+#-------------------------------------------------------------------------------#
+#
+log4j.rootCategory=WARN, STDOUT
+log4j.additivity.rootCategory=false
+
+#--------------------------------------------------#
+# Log-levels for specific Java packages #
+# Syntax: log4j.category.<full_package_name>=... #
+#--------------------------------------------------#
+#
+# Log-levels for Apache packages...
+#
+log4j.category.org.apache=WARN
+log4j.category.org.apache.ws=DEBUG
+log4j.category.org.apache.axis=INFO
+log4j.category.org.apache.axis.transport.http.SimpleAxisServer=WARN
+log4j.category.org.apache.axis.wsdl.toJava.JavaGeneratorFactory=WARN
+
+#-------------------------------------------#
+# Log appenders and their output patterns #
+#-------------------------------------------#
+# STDOUT_MSG_ONLY - a console appender that prints the message itself and
nothing else
+#
+log4j.appender.STDOUT_MSG_ONLY=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT_MSG_ONLY.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT_MSG_ONLY.layout.ConversionPattern=%m%n
+
+#
+# STDOUT_TERSE - a terse console appender
+#
+log4j.appender.STDOUT_TERSE=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT_TERSE.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT_TERSE.layout.ConversionPattern=* %5p %c{1}: %m%n
+
+# STDOUT - a console appender with average verbosity
+#
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=--> %d{MM-dd-yy HH:mm:ss} %5p
[%t] %c{1}: %m%n
+
+# STDOUT_VERBOSE - a verbose console appender; WARNING: this will slow things
down considerably!
+#
+log4j.appender.STDOUT_VERBOSE=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT_VERBOSE.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT_VERBOSE.layout.ConversionPattern=--> %d{yyyy-MMM-dd
HH:mm:ss.SSS} %5p [%t] %c.%M(%F:%L): %m%n
+
+# ROLL_FILE_TERSE - rolling file appender that writes the logs to the file
system using terse messages
+#
+log4j.appender.ROLL_FILE_TERSE=org.apache.log4j.RollingFileAppender
+log4j.appender.ROLL_FILE_TERSE.File=%SBA_HOME%/sba-log.txt
+log4j.appender.ROLL_FILE_TERSE.MaxFileSize=512KB
+log4j.appender.ROLL_FILE_TERSE.MaxBackupIndex=1
+log4j.appender.ROLL_FILE_TERSE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLL_FILE_TERSE.layout.ConversionPattern=*|%5p|%c{1}|%m%n
+
+# ROLL_FILE - rolling file appender that writes the logs to the file system
with average verbosity
+#
+log4j.appender.ROLL_FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.ROLL_FILE.File=%SBA_HOME%/sba-log.txt
+log4j.appender.ROLL_FILE.MaxFileSize=512KB
+log4j.appender.ROLL_FILE.MaxBackupIndex=1
+log4j.appender.ROLL_FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLL_FILE.layout.ConversionPattern=-->|%d{yyyyMMdd|HH:mm:ss}|%p|%t|%c{1}|%m%n
+
+# ROLL_FILE_VERBOSE - rolling file appender that writes verbose messages the
logs to the file system; WARNING this is slow!
+#
+log4j.appender.ROLL_FILE_VERBOSE=org.apache.log4j.RollingFileAppender
+log4j.appender.ROLL_FILE_VERBOSE.File=%SBA_HOME%/sba-log.txt
+log4j.appender.ROLL_FILE_VERBOSE.MaxFileSize=512KB
+log4j.appender.ROLL_FILE_VERBOSE.MaxBackupIndex=1
+log4j.appender.ROLL_FILE_VERBOSE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLL_FILE_VERBOSE.layout.ConversionPattern=-->|%d{yyyyMMMdd|HH:mm:ss.SSS}|%5p|%t|%c|%M(%F:%L)|%m%n
Modified: incubator/muse/trunk/src/webapp/WEB-INF/server-config.wsdd
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/webapp/WEB-INF/server-config.wsdd?view=diff&r1=159056&r2=159057
==============================================================================
--- incubator/muse/trunk/src/webapp/WEB-INF/server-config.wsdd (original)
+++ incubator/muse/trunk/src/webapp/WEB-INF/server-config.wsdd Fri Mar 25
12:16:21 2005
@@ -1,53 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+
+ <globalConfiguration>
+ <parameter name="adminPassword" value="admin"/>
+ <parameter name="disablePrettyXML" value="false"/>
+ <parameter name="sendXsiTypes" value="false"/>
+ <parameter name="sendMultiRefs" value="false"/>
+ <parameter name="sendXMLDeclaration" value="true"/>
+ </globalConfiguration>
+
+ <handler name="LocalResponder"
type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper"
type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate"
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+
+ <service name="AdminService" provider="java:MSG">
+ <parameter name="allowedMethods" value="AdminService"/>
+ <parameter name="enableRemoteAdmin" value="true"/>
+ <parameter name="className" value="org.apache.axis.utils.Admin"/>
+ <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+ </service>
+
+ <service name="Version" provider="java:RPC">
+ <parameter name="allowedMethods" value="getVersion"/>
+ <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
+
+ <transport name="http">
+ <requestFlow>
+ <handler type="URLMapper"/>
+ <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+ </requestFlow>
+ <parameter name="qs:list"
value="org.apache.axis.transport.http.QSListHandler"/>
+ <parameter name="useDefaultQueryStrings" value="true"/>
+ <parameter name="qs.list"
value="org.apache.axis.transport.http.QSListHandler"/>
+ <parameter name="qs.method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
+ <parameter name="qs:method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
+ </transport>
+
+ <transport name="local">
+ <responseFlow>
+ <handler type="LocalResponder"/>
+ </responseFlow>
+ </transport>
- <globalConfiguration>
- <parameter name="adminPassword" value="admin"/>
- <parameter name="disablePrettyXML" value="true"/>
- <parameter name="sendXsiTypes" value="true"/>
- <parameter name="sendMultiRefs" value="true"/>
- <parameter name="sendXMLDeclaration" value="true"/>
- </globalConfiguration>
-
- <handler name="LocalResponder"
type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper"
type="java:org.apache.axis.handlers.http.URLMapper"/>
- <handler name="Authenticate"
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
-
- <service name="AdminService" provider="java:MSG">
- <parameter name="allowedMethods" value="AdminService"/>
- <parameter name="enableRemoteAdmin" value="true"/>
- <parameter name="className" value="org.apache.axis.utils.Admin"/>
- <namespace>http://xml.apache.org/axis/wsdd/</namespace>
- </service>
-
- <service name="Version" provider="java:RPC">
- <parameter name="allowedMethods" value="getVersion"/>
- <parameter name="className" value="org.apache.axis.Version"/>
- </service>
-
- <transport name="http">
- <requestFlow>
- <handler type="URLMapper"/>
- <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
- </requestFlow>
- <parameter name="qs:list"
value="org.apache.axis.transport.http.QSListHandler"/>
- <!--
- Set the useDefaultQueryStrings to "false" if you would like the
WsdmQSWsdlHandler
- to handle ?wsdl requests and ensure the soap:address location is
returned in the wsdl
- with the same host as was sent in the ?wsdl request.
- -->
- <parameter name="useDefaultQueryStrings" value="true"/>
- <parameter name="qs:wsdl"
value="org.apache.ws.platform.axis.wsdl.WsdmQSWsdlHandler"/>
- <parameter name="qs.wsdl"
value="org.apache.ws.platform.axis.wsdl.WsdmQSWsdlHandler"/>
- <parameter name="qs.list"
value="org.apache.axis.transport.http.QSListHandler"/>
- <parameter name="qs.method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
- <parameter name="qs:method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
- </transport>
-
- <transport name="local">
- <responseFlow>
- <handler type="LocalResponder"/>
- </responseFlow>
- </transport>
-
</deployment>
Modified: incubator/muse/trunk/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/webapp/WEB-INF/web.xml?view=diff&r1=159056&r2=159057
==============================================================================
--- incubator/muse/trunk/src/webapp/WEB-INF/web.xml (original)
+++ incubator/muse/trunk/src/webapp/WEB-INF/web.xml Fri Mar 25 12:16:21 2005
@@ -1,33 +1,48 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>Muse running on Apache-Axis SOAP platform</display-name>
+ <display-name>Apache-Axis</display-name>
- <listener>
-
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
- </listener>
+ <listener>
+
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+ </listener>
+ <!-- <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AxisServlet
+ </servlet-class>
+ </servlet>
+-->
+<!-- Wsrf Servlet -->
<servlet>
- <servlet-name>ResourceManagerServlet</servlet-name>
- <display-name>Axis Servlet, extended to support WS-RF Implied Resource
Pattern</display-name>
-
<servlet-class>org.apache.ws.platform.axis.transport.http.MuwsAxisServlet</servlet-class>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.ws.resource.handler.axis.WsrfAxisServlet
+ </servlet-class>
<load-on-startup>100</load-on-startup>
</servlet>
-
+
<servlet>
<servlet-name>AdminServlet</servlet-name>
<display-name>Axis Admin Servlet</display-name>
- <servlet-class>org.apache.axis.transport.http.AdminServlet</servlet-class>
+ <servlet-class>
+ org.apache.axis.transport.http.AdminServlet
+ </servlet-class>
<load-on-startup>100</load-on-startup>
</servlet>
<servlet>
<servlet-name>SOAPMonitorService</servlet-name>
- <display-name>Axis SOAP Monitor Service</display-name>
- <servlet-class>org.apache.axis.monitor.SOAPMonitorService</servlet-class>
+ <display-name>SOAPMonitorService</display-name>
+ <servlet-class>
+ org.apache.axis.monitor.SOAPMonitorService
+ </servlet-class>
<init-param>
<param-name>SOAPMonitorPort</param-name>
<param-value>5001</param-value>
@@ -36,22 +51,17 @@
</servlet>
<servlet-mapping>
- <servlet-name>ResourceManagerServlet</servlet-name>
- <url-pattern>/servlet/ResourceManagerServlet</url-pattern>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/servlet/AxisServlet</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>ResourceManagerServlet</servlet-name>
- <url-pattern>/servlet/AxisServlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ResourceManagerServlet</servlet-name>
+ <servlet-name>AxisServlet</servlet-name>
<url-pattern>*.jws</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>ResourceManagerServlet</servlet-name>
+ <servlet-name>AxisServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
@@ -60,25 +70,25 @@
<url-pattern>/SOAPMonitor</url-pattern>
</servlet-mapping>
- <!-- uncomment this if you want the Admin servlet -->
- <!--
+ <!-- uncomment this if you want the admin servlet -->
+ <!--
<servlet-mapping>
<servlet-name>AdminServlet</servlet-name>
<url-pattern>/servlet/AdminServlet</url-pattern>
</servlet-mapping>
- -->
-
- <session-config>
- <!-- Default to 5 minute session timeouts -->
- <session-timeout>5</session-timeout>
- </session-config>
+ -->
+
+ <session-config>
+ <!-- Default to 5 minute session timeouts -->
+ <session-timeout>5</session-timeout>
+ </session-config>
<!-- currently the W3C havent settled on a media type for WSDL;
http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
for now we go with the basic 'it's XML' response -->
<mime-mapping>
<extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
+ <mime-type>text/xml</mime-type>
</mime-mapping>
<mime-mapping>
@@ -87,7 +97,6 @@
</mime-mapping>
<welcome-file-list id="WelcomeFileList">
- <welcome-file>index.htm</welcome-file>
<welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.jws</welcome-file>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
