JBossWS SVN: r5246 - in framework/trunk: src/main/java/org/jboss/wsf/framework/deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-10 12:13:39 -0500 (Mon, 10 Dec 2007)
New Revision: 5246
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
framework/trunk/version.properties
Log:
fixing typo
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java 2007-12-10 17:08:49 UTC (rev 5245)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java 2007-12-10 17:13:39 UTC (rev 5246)
@@ -30,7 +30,7 @@
*/
public class DefaultLifecycleHandlerFactory extends LifecycleHandlerFactory
{
- public LifecycleHandler newLifecylceHandler()
+ public LifecycleHandler newLifecycleHandler()
{
return new DefaultLifecycleHandler();
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-10 17:08:49 UTC (rev 5245)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-10 17:13:39 UTC (rev 5246)
@@ -80,7 +80,7 @@
private LifecycleHandler getLifecycleHandler(Deployment dep)
{
- return spiProvider.getSPI(LifecycleHandlerFactory.class).newLifecylceHandler();
+ return spiProvider.getSPI(LifecycleHandlerFactory.class).newLifecycleHandler();
}
private InvocationHandler getInvocationHandler(Endpoint ep)
Modified: framework/trunk/version.properties
===================================================================
--- framework/trunk/version.properties 2007-12-10 17:08:49 UTC (rev 5245)
+++ framework/trunk/version.properties 2007-12-10 17:13:39 UTC (rev 5246)
@@ -15,7 +15,7 @@
# Thirdparty library versions
jbossws-common=snapshot
-jbossws-spi=1.0.0.GA
+jbossws-spi=snapshot
dom4j=1.6.1
jboss-common-core=2.0.2.GA
16 years, 5 months
- 1
- 0
JBossWS SVN: r5245 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-10 12:08:49 -0500 (Mon, 10 Dec 2007)
New Revision: 5245
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java
Log:
fixing typo
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2007-12-10 12:44:21 UTC (rev 5244)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2007-12-10 17:08:49 UTC (rev 5245)
@@ -29,5 +29,5 @@
*/
public abstract class LifecycleHandlerFactory implements SPIView
{
- public abstract LifecycleHandler newLifecylceHandler();
+ public abstract LifecycleHandler newLifecycleHandler();
}
16 years, 5 months
- 1
- 0
JBossWS SVN: r5244 - in legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests: src/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-10 07:44:21 -0500 (Mon, 10 Dec 2007)
New Revision: 5244
Added:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/scripts/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/wstools-config.xml
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
Log:
Fix JBPAPP-354
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2007-12-10 12:40:30 UTC (rev 5243)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2007-12-10 12:44:21 UTC (rev 5244)
@@ -498,7 +498,9 @@
<mkdir dir="${tests.output.dir}/reports"/>
<junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}">
<jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/>
<sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="test.execution.dir" value="${tests.output.dir}"/>
<sysproperty key="client.scenario" value="${client.scenario}"/>
<sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
@@ -537,7 +539,9 @@
<junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
<jvmarg line="${remote.debug.line}"/>
<jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/>
<sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="test.execution.dir" value="${tests.output.dir}"/>
<sysproperty key="client.scenario" value="${client.scenario}"/>
<sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2007-12-10 12:44:21 UTC (rev 5244)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.scripts;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * JBWS-1793: Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class ScriptTestCase extends TestCase
+{
+ private String TOOLS_CONFIG = "resources/tools/scripts/wstools-config.xml";
+
+ private String JBOSS_HOME;
+ private String JDK_HOME;
+ private String TEST_EXEC_DIR;
+ private String OS;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ JBOSS_HOME = System.getProperty("jboss.home");
+ TEST_EXEC_DIR = System.getProperty("test.execution.dir");
+ JDK_HOME = System.getProperty("jdk.home");
+ OS = System.getProperty("os.name").toLowerCase();
+ }
+
+ public void testWSToolsFromCommandLine() throws Exception
+ {
+ if(isWindowsOS())
+ {
+ fail("This test has not been verified on windows");
+ }
+
+ // use absolute path for the output to be re-usable
+ String absToolsConfig= new File(TOOLS_CONFIG).getAbsolutePath();
+ String absOutput = new File("wstools/java").getAbsolutePath();
+
+ String command = JBOSS_HOME + "/bin/wstools.sh -config "+ absToolsConfig + " -dest "+absOutput;
+ Process p = executeCommand(command);
+
+ // check status code
+ assertStatusCode(p, "wstools");
+
+ File javaSource = new File("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java");
+
+ assertTrue("Service endpoint interface not generated", javaSource.exists());
+ }
+
+ private Process executeCommand(String command)
+ throws IOException
+ {
+ // be verbose
+ System.out.println("cmd: " + command);
+ System.out.println("test execution dir: " + new File(TEST_EXEC_DIR).getAbsolutePath());
+
+ Process p = Runtime.getRuntime().exec(
+ command,
+ new String[] {"JBOSS_HOME="+ JBOSS_HOME, "JAVA_HOME="+ JDK_HOME}
+ );
+ return p;
+ }
+
+ private void assertStatusCode(Process p, String s)
+ throws InterruptedException
+ {
+ // check status code
+ int status = p.waitFor();
+ assertTrue(s +" did exit with status " + status, status==0);
+ }
+
+ private boolean isWindowsOS()
+ {
+ return ( (OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1 ));
+ }
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook.wsdl
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook.wsdl (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook.wsdl 2007-12-10 12:44:21 UTC (rev 5244)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws810' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws810/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws810' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws810/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws810/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name="Person">
+ <restriction base="string">
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name="TelephoneNumber">
+ <restriction base="string">
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook_PortType.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook_PortType.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook_PortType.java 2007-12-10 12:44:21 UTC (rev 5244)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws810;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public java.lang.String lookup(java.lang.String parameters) throws
+ java.rmi.RemoteException;
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/jaxrpc-mapping.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/jaxrpc-mapping.xml 2007-12-10 12:44:21 UTC (rev 5244)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws810</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws810</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws810">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws810.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws810">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws810">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/wstools-config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/wstools-config.xml 2007-12-10 12:44:21 UTC (rev 5244)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/scripts/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/scripts/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 5 months
- 1
- 0
JBossWS SVN: r5243 - legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-10 07:40:30 -0500 (Mon, 10 Dec 2007)
New Revision: 5243
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSTools.java
Log:
wstools error handling
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSTools.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSTools.java 2007-12-10 10:42:07 UTC (rev 5242)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSTools.java 2007-12-10 12:40:30 UTC (rev 5243)
@@ -23,17 +23,17 @@
// $Id$
+import org.jboss.logging.Logger;
+import org.jboss.ws.tools.config.ToolsSchemaConfigReader;
+import org.jboss.ws.tools.helpers.ToolsHelper;
+
import java.io.File;
import java.io.IOException;
+import java.io.PrintWriter;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.StringTokenizer;
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.tools.config.ToolsSchemaConfigReader;
-import org.jboss.ws.tools.helpers.ToolsHelper;
-
/**
* Main Class for WSTools
*
@@ -55,7 +55,19 @@
public static void main(String[] args) throws IOException
{
WSTools tools = new WSTools();
- tools.generate(args);
+ boolean success = false;
+ try
+ {
+ success = tools.generate(args);
+ } catch (Throwable e)
+ {
+ e.printStackTrace( new PrintWriter(System.err) );
+ }
+
+ if(success)
+ System.exit(0);
+ else
+ System.exit(1);
}
/**
@@ -111,8 +123,7 @@
}
else
{
- System.out.println("Usage: wstools (-classpath|-cp) <classpath> -config <config> [-dest <destination path>]");
- System.exit(1);
+ throw new IOException("Usage: wstools (-classpath|-cp) <classpath> -config <config> [-dest <destination path>]");
}
}
@@ -123,7 +134,7 @@
{
if (config == null)
throw new IllegalArgumentException("Configuration is null");
-
+
if (outputDir == null)
outputDir = ".";
@@ -138,7 +149,7 @@
}
else
{
- throw new WSException("Nothing done, Configuration source must have JavaToWSDL or WSDLToJava specified");
+ throw new IOException("Nothing done, Configuration source must have JavaToWSDL or WSDLToJava specified");
}
return true;
}
16 years, 5 months
- 1
- 0
JBossWS SVN: r5242 - legacy/branches/jbossws-1.2.1.GA_CP/build/etc.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-10 05:42:07 -0500 (Mon, 10 Dec 2007)
New Revision: 5242
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.bat
legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.sh
Log:
Fix JBPAPP-354
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.bat
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.bat 2007-12-08 02:02:12 UTC (rev 5241)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.bat 2007-12-10 10:42:07 UTC (rev 5242)
@@ -42,6 +42,10 @@
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
+
rem Display our environment
echo ========================================================================="
echo .
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.sh
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.sh 2007-12-08 02:02:12 UTC (rev 5241)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/etc/wstools.sh 2007-12-10 10:42:07 UTC (rev 5242)
@@ -59,6 +59,10 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
16 years, 5 months
- 1
- 0
JBossWS SVN: r5241 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: invocation and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-07 21:02:12 -0500 (Fri, 07 Dec 2007)
New Revision: 5241
Added:
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java
Modified:
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java
Log:
Recording system based on JAX-WS handler, first implementation
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-12-08 02:00:07 UTC (rev 5240)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Vector;
import javax.management.ObjectName;
@@ -35,6 +36,8 @@
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
/**
* A general JAXWS endpoint.
@@ -56,7 +59,9 @@
private EndpointMetrics metrics;
private List<BindingCustomization> bindingCustomizsations = new ArrayList<BindingCustomization>();
private String address;
-
+ private List<RecordProcessor> recordProcessors = new Vector<RecordProcessor>();
+ private boolean recording = false;
+
DefaultEndpoint(String targetBean)
{
this.targetBean = targetBean;
@@ -244,4 +249,35 @@
if (state == EndpointState.STARTED)
throw new IllegalStateException("Cannot modify endpoint properties in state: " + state);
}
+
+ public List<RecordProcessor> getRecordProcessors()
+ {
+ return recordProcessors;
+ }
+
+ public void setRecordProcessors(List<RecordProcessor> recordProcessors)
+ {
+ this.recordProcessors = new Vector<RecordProcessor>(recordProcessors);
+ }
+
+ public boolean isRecording()
+ {
+ return recording;
+ }
+
+ public void setRecording(boolean value)
+ {
+ this.recording = value;
+ }
+
+ public void processRecord(Record record)
+ {
+ if (this.isRecording())
+ {
+ for (RecordProcessor processor : recordProcessors)
+ {
+ processor.processRecord(record);
+ }
+ }
+ }
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-08 02:00:07 UTC (rev 5240)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -23,6 +23,11 @@
//$Id$
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.wsf.framework.management.recording.RecordDumpProcessor;
+import org.jboss.wsf.framework.management.recording.RecordWriterProcessor;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -35,6 +40,7 @@
import org.jboss.wsf.spi.invocation.InvocationType;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
@@ -70,6 +76,13 @@
InvocationHandler invocationHandler = getInvocationHandler(ep);
if (invocationHandler != null)
ep.setInvocationHandler(invocationHandler);
+
+ //TODO!! still to be configured...
+ List<RecordProcessor> recordProcessorList = new LinkedList<RecordProcessor>();
+ recordProcessorList.add(new RecordWriterProcessor());
+ recordProcessorList.add(new RecordDumpProcessor());
+ ep.setRecordProcessors(recordProcessorList);
+
}
}
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -0,0 +1,213 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.wsf.framework.invocation;
+
+
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.framework.management.recording.RecordFactory;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordGroupAssociation;
+import org.jboss.wsf.spi.management.recording.Record.MessageType;
+import org.jboss.wsf.test.GenericSOAPHandler;
+
+/**
+ *
+ */
+public class RecordingServerHandler extends GenericSOAPHandler
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(RecordingServerHandler.class);
+
+ protected boolean handleInbound(MessageContext ctx)
+ {
+ log.info("*** INBOUND ***");
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ if (endpoint.isRecording())
+ {
+ Long groupID = RecordFactory.newGroupID();
+ RecordGroupAssociation.pushGroupID(groupID);//check, perhaps we should try peeking before pushing...
+ Record record = RecordFactory.newRecord(groupID);
+ record.setDate(new Date());
+ HttpServletRequest httpServletRequest = (HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST);
+ if (httpServletRequest != null)
+ {
+ try
+ {
+ record.setDestinationHost(new URL(httpServletRequest.getRequestURL().toString()).getHost());
+ record.setSourceHost(httpServletRequest.getRemoteHost());
+ }
+ catch (Exception e)
+ {
+ log.warn("Unable to read from the http servlet request! " + e.getMessage());
+ }
+ }
+ record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_REQUEST_HEADERS)));
+ record.setMessageType(MessageType.INBOUND);
+ record.setOperation((String)ctx.get(MessageContext.WSDL_OPERATION));
+ SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
+ try
+ {
+ SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+ if (soapEnv != null)
+ {
+ record.setEnvelope(DOMWriter.printNode(soapEnv, true));
+ }
+ }
+ catch (SOAPException ex)
+ {
+ log.error("Cannot trace SOAPMessage", ex);
+ }
+ endpoint.processRecord(record);
+
+// log.info("WSDL_OPERATION: "+ctx.get(MessageContext.WSDL_OPERATION));
+// log.info("WSDL_PORT: "+ctx.get(MessageContext.WSDL_PORT));
+// log.info("WSDL_SERVICE: "+ctx.get(MessageContext.WSDL_SERVICE));
+// log.info("PATH_INFO: "+ctx.get(MessageContext.PATH_INFO));
+// log.info("QUERY_STRING: "+ctx.get(MessageContext.QUERY_STRING));
+// log.info("HTTP_REQUEST_METHOD: "+ctx.get(MessageContext.HTTP_REQUEST_METHOD));
+// log.info("HTTP_RESPONSE_CODE: "+ctx.get(MessageContext.HTTP_RESPONSE_CODE));
+// log.info("HTTP_REQUEST_HEADERS: "+this.printHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_REQUEST_HEADERS))));
+// log.info("HTTP_RESPONSE_HEADERS: "+this.printHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS))));
+// log.info("WSDL_INTERFACE: "+ctx.get(MessageContext.WSDL_INTERFACE));
+// log.info("SERVLET_REQUEST: "+(HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST));
+// if ((HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST)!=null)
+// {
+// try {
+// log.info("DESTINATION HOST: "+new URL(((HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST)).getRequestURL().toString()).getHost());
+// } catch (Exception e) {e.printStackTrace();}
+// log.info("SOURCE HOST: "+((HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST)).getRemoteHost());
+// }
+//
+//
+// try
+// {
+// SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+// if (soapEnv != null)
+// {
+// String envStr = DOMWriter.printNode(soapEnv, true);
+// log.info("ENVELOPE: "+envStr);
+// }
+// }
+// catch (SOAPException ex)
+// {
+// log.error("Cannot trace SOAPMessage", ex);
+// }
+ }
+ return true;
+ }
+
+ private String printHeaders(Map<String,List<String>> headers)
+ {
+ StringBuffer sb = new StringBuffer();
+ if (headers!=null)
+ {
+ for (String key : headers.keySet())
+ {
+ sb.append(key);
+ sb.append(": ");
+ for (String h : headers.get(key))
+ {
+ sb.append(h);
+ sb.append("; ");
+ }
+ sb.append("\n");
+ }
+ }
+ return sb.toString();
+ }
+
+ protected boolean handleOutbound(MessageContext ctx)
+ {
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ log.info("*** OUTBOUND ***");
+ if (endpoint.isRecording())
+ {
+ Long groupID = RecordGroupAssociation.popGroupID();//check, perhaps we should try peeking before popping...
+ Record record = RecordFactory.newRecord(groupID);
+ record.setDate(new Date());
+ record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS)));
+ record.setMessageType(MessageType.OUTBOUND);
+ record.setOperation((String)ctx.get(MessageContext.WSDL_OPERATION));
+ SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
+ try
+ {
+ SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+ if (soapEnv != null)
+ {
+ record.setEnvelope(DOMWriter.printNode(soapEnv, true));
+ }
+ }
+ catch (SOAPException ex)
+ {
+ log.error("Cannot trace SOAPMessage", ex);
+ }
+ endpoint.processRecord(record);
+
+
+// log.info("WSDL_OPERATION: "+ctx.get(MessageContext.WSDL_OPERATION));
+// log.info("WSDL_PORT: "+ctx.get(MessageContext.WSDL_PORT));
+// log.info("WSDL_SERVICE: "+ctx.get(MessageContext.WSDL_SERVICE));
+// log.info("PATH_INFO: "+ctx.get(MessageContext.PATH_INFO));
+// log.info("QUERY_STRING: "+ctx.get(MessageContext.QUERY_STRING));
+// log.info("HTTP_REQUEST_METHOD: "+ctx.get(MessageContext.HTTP_REQUEST_METHOD));
+// log.info("HTTP_RESPONSE_CODE: "+ctx.get(MessageContext.HTTP_RESPONSE_CODE));
+// log.info("HTTP_REQUEST_HEADERS: "+this.printHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_REQUEST_HEADERS))));
+// log.info("HTTP_RESPONSE_HEADERS: "+this.printHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS))));
+//
+// try
+// {
+// SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+// if (soapEnv != null)
+// {
+// String envStr = DOMWriter.printNode(soapEnv, true);
+// log.info("ENVELOPE: "+envStr);
+// }
+// }
+// catch (SOAPException ex)
+// {
+// log.error("Cannot trace SOAPMessage", ex);
+// }
+ }
+ return true;
+ }
+
+ public boolean handleFault(MessageContext arg0)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-08 02:00:07 UTC (rev 5240)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -27,6 +27,8 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
/**
* The endpoint MBean representation
@@ -106,4 +108,25 @@
{
endpoint.getLifecycleHandler().stop(endpoint);
}
+
+ public boolean isRecording()
+ {
+ return endpoint.isRecording();
+ }
+
+ public void setRecording(boolean value)
+ {
+ endpoint.setRecording(value);
+ }
+
+ public void processRecord(Record record)
+ {
+ if (this.isRecording())
+ {
+ for (RecordProcessor processor : endpoint.getRecordProcessors())
+ {
+ processor.processRecord(record);
+ }
+ }
+ }
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java 2007-12-08 02:00:07 UTC (rev 5240)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -23,6 +23,8 @@
import java.util.Date;
+import org.jboss.wsf.spi.management.recording.Record;
+
/**
* MBean interface.
* @since 15-April-2004
@@ -50,4 +52,10 @@
long getFaultCount();
long getResponseCount();
+
+ boolean isRecording();
+
+ void setRecording(boolean value);
+
+ void processRecord(Record record);
}
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.List;
+import java.util.Vector;
+
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public abstract class AbstractRecordProcessor implements RecordProcessor
+{
+
+ protected List<RecordFilter> filters = new Vector<RecordFilter>();
+ protected boolean processDestinationHost;
+ protected boolean processSourceHost;
+ protected boolean processHeaders;
+ protected boolean processMessage;
+ protected boolean processMessageType;
+ protected boolean processOperation;
+
+ public abstract void processRecord(Record record);
+
+ public void addFilter(RecordFilter filter)
+ {
+ filters.add(filter);
+ }
+
+ public List<RecordFilter> getFilters()
+ {
+ return filters;
+ }
+
+ public void setFilters(List<RecordFilter> filters)
+ {
+ this.filters = new Vector<RecordFilter>(filters);
+ }
+
+ public boolean isProcessDestinationHost()
+ {
+ return processDestinationHost;
+ }
+
+ public void setProcessDestinationHost(boolean processDestinationHost)
+ {
+ this.processDestinationHost = processDestinationHost;
+ }
+
+ public boolean isProcessSourceHost()
+ {
+ return processSourceHost;
+ }
+
+ public void setProcessSourceHost(boolean processSourceHost)
+ {
+ this.processSourceHost = processSourceHost;
+ }
+
+ public boolean isProcessHeaders()
+ {
+ return processHeaders;
+ }
+
+ public void setProcessHeaders(boolean processHeaders)
+ {
+ this.processHeaders = processHeaders;
+ }
+
+ public boolean isProcessMessage()
+ {
+ return processMessage;
+ }
+
+ public void setProcessMessage(boolean processMessage)
+ {
+ this.processMessage = processMessage;
+ }
+
+ public boolean isProcessMessageType()
+ {
+ return processMessageType;
+ }
+
+ public void setProcessMessageType(boolean processMessageType)
+ {
+ this.processMessageType = processMessageType;
+ }
+
+ public boolean isProcessOperation()
+ {
+ return processOperation;
+ }
+
+ public void setProcessOperation(boolean processOperation)
+ {
+ this.processOperation = processOperation;
+ }
+
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management.recording;
+
+//$Id$
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.Record.MessageType;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public class RecordDumpProcessor extends AbstractRecordProcessor
+{
+ private Logger log = Logger.getLogger(this.getClass()); //fare qualcosa di meglio, magari loggare con un nome di classe specifico e un pre-log col recordID
+
+ @Override
+ public void processRecord(Record record)
+ {
+ StringBuffer sb = new StringBuffer();
+ if (record.getMessageType() == MessageType.INBOUND)
+ {
+ sb.append("INBOUND MESSAGE from ");
+ sb.append(record.getSourceHost());
+ }
+ else if (record.getMessageType() == MessageType.OUTBOUND)
+ {
+ sb.append("OUTBOUND MESSAGE to ");
+ sb.append(record.getDestinationHost());
+ }
+ else
+ {
+ log.warn("Unknown message type: " + record.getMessageType());
+ }
+ sb.append(": \n");
+ Map<String, List<String>> headers = record.getHeaders();
+ if (headers != null)
+ {
+ for (String key : headers.keySet())
+ {
+ sb.append(key);
+ sb.append(": ");
+ for (String h : headers.get(key))
+ {
+ sb.append(h);
+ sb.append("; ");
+ }
+ sb.append("\n");
+ }
+ }
+ if (record.getPayload() != null)
+ {
+ try
+ {
+ ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+ out.write(record.getPayload());
+ out.close();
+ sb.append(out.toString()); //improve this...
+ sb.append("\n");
+ }
+ catch (IOException e)
+ {
+ log.warn("Error while writing the payload!");
+ }
+ }
+ log.debug(sb.toString());
+ log.debug(record.getEnvelope());
+ }
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management.recording;
+
+//$Id$
+
+import org.jboss.wsf.spi.management.recording.Record;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public class RecordFactory
+{
+ public static Long newGroupID()
+ {
+ //TODO-ALE!! fare meglio... concorrenza
+ return new Long(System.currentTimeMillis());
+ }
+
+ public static Record newRecord(Long groupID)
+ {
+ Record record = new RecordImpl();
+ record.setGroupID(groupID);
+ return record;
+ }
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.wsf.spi.management.recording.Record;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public class RecordImpl implements Record
+{
+ private String sourceHost;
+ private String destinationHost;
+ private Map<String, List<String>> headers = new HashMap<String, List<String>>();
+ private byte[] payload;
+ private MessageType messageType;
+ private String operation;
+ private Long groupID;
+ private Date date;
+ private String envelope;
+
+
+ public void addHeaders(String key, List<String> value)
+ {
+ headers.put(key, value);
+ }
+
+ public Map<String, List<String>> getHeaders()
+ {
+ return headers;
+ }
+
+ public MessageType getMessageType()
+ {
+ return messageType;
+ }
+
+ public byte[] getPayload()
+ {
+ return payload;
+ }
+
+ public void setMessageType(MessageType messageType)
+ {
+ this.messageType = messageType;
+ }
+
+ public void setPayload(byte[] payload)
+ {
+ this.payload = payload;
+ }
+
+ public String getSourceHost()
+ {
+ return sourceHost;
+ }
+
+ public void setSourceHost(String sourceHost)
+ {
+ this.sourceHost = sourceHost;
+ }
+
+ public String getDestinationHost()
+ {
+ return destinationHost;
+ }
+
+ public void setDestinationHost(String destinationHost)
+ {
+ this.destinationHost = destinationHost;
+ }
+
+ public void setHeaders(Map<String, List<String>> headers)
+ {
+ this.headers = headers;
+ }
+
+ public Long getGroupID()
+ {
+ return groupID;
+ }
+
+ public String getOperation()
+ {
+ return operation;
+ }
+
+ public void setGroupID(Long groupID)
+ {
+ this.groupID = groupID;
+ }
+
+ public void setOperation(String operation)
+ {
+ this.operation = operation;
+ }
+
+ public Date getDate()
+ {
+ return date;
+ }
+
+ public void setDate(Date date)
+ {
+ this.date = date;
+ }
+
+ public void setEnvelope(String envelope)
+ {
+ this.envelope = envelope;
+ }
+
+ public String getEnvelope()
+ {
+ return envelope;
+ }
+
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java 2007-12-08 02:02:12 UTC (rev 5241)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management.recording;
+
+//$Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.management.recording.Record;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public class RecordWriterProcessor extends AbstractRecordProcessor
+{
+ private Logger log = Logger.getLogger(this.getClass());
+
+ @Override
+ public void processRecord(Record arg0)
+ {
+ log.info("processerei il messaggio...");
+ }
+
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 6 months
- 1
- 0
JBossWS SVN: r5240 - in spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi: management and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-07 21:00:07 -0500 (Fri, 07 Dec 2007)
New Revision: 5240
Added:
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
Modified:
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
Log:
Recording system based on JAX-WS handler, first implementation
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-12-07 15:18:26 UTC (rev 5239)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-12-08 02:00:07 UTC (rev 5240)
@@ -23,11 +23,15 @@
// $Id$
+import java.util.List;
+
import javax.management.ObjectName;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
/**
* A general JAXWS endpoint.
@@ -116,4 +120,13 @@
/** Set the endpoint metrics for this endpoint */
void setEndpointMetrics(EndpointMetrics metrics);
+
+ List<RecordProcessor> getRecordProcessors();
+ void setRecordProcessors(List<RecordProcessor> recordProcessors);
+
+ boolean isRecording();
+
+ void setRecording(boolean value);
+
+ void processRecord(Record record);
}
Added: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java (rev 0)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-08 02:00:07 UTC (rev 5240)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management.recording;
+
+//$Id$
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public interface Record
+{
+ public enum MessageType {INBOUND, OUTBOUND};
+
+ public Long getGroupID();
+
+ public void setGroupID(Long groupID);
+
+ public Date getDate();
+
+ public void setDate(Date date);
+
+ /**
+ * Gets the source (message sender) host. The result format conforms to RFC2732
+ *
+ * @return source host
+ */
+ public String getSourceHost();
+
+ public void setSourceHost(String host);
+
+ /**
+ * Gets the source (message sender) host. The result format conforms to RFC2732
+ *
+ * @return the source host
+ */
+ public String getDestinationHost();
+
+ public void setDestinationHost(String host);
+
+ /**
+ * Gets the message type, i.e. MessageType.INBOUND or MessageType.OUTBOUND
+ *
+ * @return the message type
+ */
+ public MessageType getMessageType();
+
+ public void setMessageType(MessageType type);
+
+ /**
+ * Gets the message payload contents as a byte[].
+ *
+ * @return the payload
+ */
+ public byte[] getPayload();
+
+ public void setPayload(byte[] payload);
+
+ public void setEnvelope(String envelope);
+ public String getEnvelope();
+
+ /**
+ * Gets the HTTP headers
+ *
+ * @return the headers
+ */
+ public Map<String, List<String>> getHeaders();
+
+ public void addHeaders(String key, List<String> value);
+
+ public void setHeaders(Map<String, List<String>> headers);
+
+ /**
+ * Gets the invoked operation
+ *
+ * @return the operation
+ */
+ public String getOperation();
+
+ public void setOperation(String operation);
+}
Property changes on: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java (rev 0)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2007-12-08 02:00:07 UTC (rev 5240)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management.recording;
+
+//$Id$
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public interface RecordFilter
+{
+ public boolean match(Record record);
+}
Property changes on: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java (rev 0)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2007-12-08 02:00:07 UTC (rev 5240)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management.recording;
+
+import java.util.Stack;
+
+import org.jboss.logging.Logger;
+
+//$Id$
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public class RecordGroupAssociation
+{
+ private static ThreadLocal<Stack<Long>> groupIDAssoc = new ThreadLocal<Stack<Long>>();
+
+ // provide logging
+ private static Logger log = Logger.getLogger(RecordGroupAssociation.class);
+
+
+ public static void pushGroupID(Long groupID)
+ {
+ if(log.isDebugEnabled()) log.debug("pushGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
+ Stack<Long> stack = groupIDAssoc.get();
+ if (stack == null)
+ {
+ stack = new Stack<Long>();
+ groupIDAssoc.set(stack);
+ }
+ stack.push(groupID);
+ }
+
+ public static Long peekGroupID()
+ {
+ Long groupID = null;
+ Stack<Long> stack = groupIDAssoc.get();
+ if (stack != null && stack.isEmpty() == false)
+ {
+ groupID = stack.peek();
+ }
+ if(log.isDebugEnabled()) log.debug("peekGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
+ return groupID;
+ }
+
+ public static Long popGroupID()
+ {
+ Long groupID = null;
+ Stack<Long> stack = groupIDAssoc.get();
+ if (stack != null && stack.isEmpty() == false)
+ {
+ groupID = stack.pop();
+ }
+ if(log.isDebugEnabled()) log.debug("popGroupID: " + groupID +" (Thread " +Thread.currentThread().getName()+ ")");
+ return groupID;
+ }
+
+}
Property changes on: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java (rev 0)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-08 02:00:07 UTC (rev 5240)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management.recording;
+
+//$Id$
+
+import java.util.List;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 8-Dec-2007
+ */
+public interface RecordProcessor
+{
+ /**
+ * To be used to have this processor process the specified record
+ *
+ * @param record
+ */
+ public void processRecord(Record record);
+
+ /** Filters: a record is processed only if it matches all the processor's filters **/
+ public List<RecordFilter> getFilters();
+ public void addFilter(RecordFilter filter);
+ public void setFilters(List<RecordFilter> filters);
+
+ /** Fine grained management of records' field to be processed **/
+ public boolean isProcessSourceHost();
+ public void setProcessSourceHost(boolean value);
+ public boolean isProcessDestinationHost();
+ public void setProcessDestinationHost(boolean value);
+ public boolean isProcessMessageType();
+ public void setProcessMessageType(boolean value);
+ public boolean isProcessMessage();
+ public void setProcessMessage(boolean value);
+ public boolean isProcessHeaders();
+ public void setProcessHeaders(boolean value);
+ public boolean isProcessOperation();
+ public void setProcessOperation(boolean value);
+
+}
Property changes on: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 6 months
- 1
- 0
JBossWS SVN: r5239 - in stack/metro/trunk: src/main/distro and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-07 10:18:26 -0500 (Fri, 07 Dec 2007)
New Revision: 5239
Modified:
stack/metro/trunk/ant-import/build-bin-dist.xml
stack/metro/trunk/src/main/distro/bin-dist-build.xml
Log:
Remove thirdparty.dir
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2007-12-07 15:15:18 UTC (rev 5238)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2007-12-07 15:18:26 UTC (rev 5239)
@@ -12,142 +12,142 @@
<!-- $Id$ -->
<project>
-
- <!-- ================================================================== -->
- <!-- Binary distribution -->
- <!-- ================================================================== -->
-
- <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
-
- <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
- <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
- <mkdir dir="${bindist.tools.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example" >
- <filterset>
- <filtersfile file="${sunri.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${sunri.dir}/ant-import">
- <include name="macros-deploy-framework.xml"/>
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- </copy>
-
- <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${sunri.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
-
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}" >
- <fileset dir="${sunri.output.dir}">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
- <copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${sunri.distro.dir}">
- <include name="Install.txt"/>
- <include name="ReleaseNotes.txt"/>
- </fileset>
- <filterset>
- <filtersfile file="${sunri.dir}/version.properties"/>
- </filterset>
- </copy>
-
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${sunri.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${sunri.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-sunri.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- <include name="jbossws-sunri42.sar"/>
- <include name="jbossws-sunri50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr250-api.jar"/>
- <include name="juddi-service.sar"/>
- <include name="resolver.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wstx.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/src/test-framework"/>
- <fileset dir="${sunri.dir}/src/test">
- <include name="resources/test-excludes-*.txt"/>
- </fileset>
- </copy>
-
- <!-- build tools -->
- <copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/tools/ant"/>
- </copy>
- <copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${sunri.dir}">
- <include name="build.bat"/>
- <include name="build.sh"/>
- </fileset>
- </copy>
- <chmod file="${bindist.dir}/build.sh" perm="+x"/>
-
- <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip">
- <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
+
+ <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+ <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+ <mkdir dir="${bindist.tools.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example">
+ <filterset>
+ <filtersfile file="${sunri.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${sunri.dir}/ant-import">
+ <include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ </copy>
+
+ <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${sunri.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${sunri.output.dir}">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${bindist.docs.dir}" filtering="yes">
+ <fileset dir="${sunri.distro.dir}">
+ <include name="Install.txt"/>
+ <include name="ReleaseNotes.txt"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${sunri.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${sunri.etc.dir}">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${sunri.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-sunri.jar"/>
+ <include name="jbossws-sunri-client.jar"/>
+ <include name="jbossws-sunri42.sar"/>
+ <include name="jbossws-sunri50.sar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="FastInfoset.jar"/>
+ <include name="http.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxrpc-api.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jsr173_api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="jsr250-api.jar"/>
+ <include name="juddi-service.sar"/>
+ <include name="resolver.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wstx.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}/src/test-framework"/>
+ <fileset dir="${sunri.dir}/src/test">
+ <include name="resources/test-excludes-*.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- build tools -->
+ <copy todir="${bindist.tools.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}/tools/ant"/>
+ </copy>
+ <copy todir="${bindist.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ </fileset>
+ </copy>
+ <chmod file="${bindist.dir}/build.sh" perm="+x"/>
+
+ <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
\ No newline at end of file
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:15:18 UTC (rev 5238)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:18:26 UTC (rev 5239)
@@ -12,87 +12,85 @@
<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
<project default="main" basedir="." name="JBossWS-sunri">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${basedir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
-
- <property name="jboss500.lib" value="${jboss500.home}/lib"/>
- <property name="jboss500.client" value="${jboss500.home}/client"/>
- <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
- <property name="jboss422.lib" value="${jboss422.home}/lib"/>
- <property name="jboss422.client" value="${jboss422.home}/client"/>
- <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
- <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
- <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
-
- <available property="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss422.available" file="${jboss422.available.file}"/>
-
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- </or>
- </condition>
- <condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
-
-
- <!-- JDK Detection -->
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${basedir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+
+ <condition property="jbossws.integration.jboss42" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </or>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+
+ <!-- JDK Detection -->
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
<fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
-
- <import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/macros-deploy-framework.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- </condition>
-
- <!-- Define excludesfile -->
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/macros-deploy-framework.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss500.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss422.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+
+ <!-- Define excludesfile -->
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
<pathelement location="${lib.dir}/jbossws-common.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/FastInfoset.jar"/>
@@ -112,56 +110,56 @@
<pathelement location="${lib.dir}/streambuffer.jar"/>
<pathelement location="${lib.dir}/wstx.jar"/>
<pathelement location="${lib.dir}/wsdl4j.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-sunri-client.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/>
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
+ <pathelement location="${lib.dir}/jaxws-tools.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
<!-- dummy jar targets -->
- <target name="jars-jboss50" depends="prepare"/>
- <target name="jars-jboss42" depends="prepare"/>
+ <target name="jars-jboss50" depends="prepare"/>
+ <target name="jars-jboss42" depends="prepare"/>
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${tests.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
\ No newline at end of file
16 years, 6 months
- 1
- 0
JBossWS SVN: r5238 - stack/cxf/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-07 10:15:18 -0500 (Fri, 07 Dec 2007)
New Revision: 5238
Modified:
stack/cxf/trunk/src/main/distro/bin-dist-build.xml
Log:
Fix typo
Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:12:04 UTC (rev 5237)
+++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:15:18 UTC (rev 5238)
@@ -11,7 +11,7 @@
<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
-<project default="main" basedir="." name="JBossWS-cxf">
+<project default="main" basedir="." name="JBossWS-CXF">
<!-- ================================================================== -->
<!-- Setup -->
@@ -21,7 +21,6 @@
<property name="bin.dir" value="${basedir}/bin"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${basedir}/output"/>
16 years, 6 months
- 1
- 0
JBossWS SVN: r5237 - in stack/cxf/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-07 10:12:04 -0500 (Fri, 07 Dec 2007)
New Revision: 5237
Modified:
stack/cxf/trunk/ant-import/build-bin-dist.xml
stack/cxf/trunk/ant-import/build-testsuite.xml
stack/cxf/trunk/build.xml
stack/cxf/trunk/src/main/distro/bin-dist-build.xml
Log:
Build jbossws-cxf-client.jar
Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-12-07 15:05:36 UTC (rev 5236)
+++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-12-07 15:12:04 UTC (rev 5237)
@@ -96,6 +96,7 @@
<fileset dir="${cxf.dir}/output/lib">
<include name="jbossws-context.war"/>
<include name="jbossws-cxf.jar"/>
+ <include name="jbossws-cxf-client.jar"/>
<include name="jbossws-cxf42.sar"/>
<include name="jbossws-cxf50.sar"/>
</fileset>
Modified: stack/cxf/trunk/ant-import/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-07 15:05:36 UTC (rev 5236)
+++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-07 15:12:04 UTC (rev 5237)
@@ -44,6 +44,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/>
<pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/>
<pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/>
</path>
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2007-12-07 15:05:36 UTC (rev 5236)
+++ stack/cxf/trunk/build.xml 2007-12-07 15:12:04 UTC (rev 5237)
@@ -110,6 +110,12 @@
<metainf dir="${cxf.resources.dir}/jbossws-cxf.jar/META-INF"/>
</jar>
+ <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf-client.jar" manifest="${cxf.output.etc.dir}/default.mf">
+ <fileset dir="${cxf.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/cxf/client/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws-context.war -->
<war warfile="${cxf.output.lib.dir}/jbossws-context.war" webxml="${cxf.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
<fileset dir="${cxf.resources.dir}/jbossws-context.war">
Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:05:36 UTC (rev 5236)
+++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:12:04 UTC (rev 5237)
@@ -107,8 +107,9 @@
</path>
<path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
+ <pathelement location="${lib.dir}/jbossws-cxf-client.jar"/>
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
+ <pathelement location="${lib.dir}/jaxws-tools.jar"/>
</path>
</target>
16 years, 6 months
- 1
- 0