JBossWS SVN: r5376 - stack/metro/trunk/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 09:55:37 -0500 (Thu, 20 Dec 2007)
New Revision: 5376
Modified:
stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
Log:
Use org.jboss.wsf.common.logging
Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-12-20 14:55:00 UTC (rev 5375)
+++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-12-20 14:55:37 UTC (rev 5376)
@@ -30,24 +30,13 @@
</bean>
<!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.log.JDKLogRedirector">
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
<property name="namespaces">
<list class="java.util.LinkedList" elementClass="java.lang.String">
<value>javax.enterprise.resource.webservices.jaxws</value>
<value>com.sun</value>
</list>
</property>
- <property name="levelMapping">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>INFO</key><value>info</value></entry>
- <entry><key>SEVERE</key><value>error</value></entry>
- <entry><key>WARNING</key><value>warn</value></entry>
- <entry><key>FINE</key><value>debug</value></entry>
- <entry><key>FINER</key><value>trace</value></entry>
- <entry><key>FINEST</key><value>trace</value></entry>
- </map>
- </property>
- <property name="defaultLevel">debug</property>
</bean>
<!--
16 years, 4 months
- 1
- 0
JBossWS SVN: r5375 - in stack/cxf/trunk/src: test/java/org/jboss/test/ws/jaxws/cxf/descriptor and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 09:55:00 -0500 (Thu, 20 Dec 2007)
New Revision: 5375
Modified:
stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml
Log:
Use org.jboss.wsf.common.logging
Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2007-12-20 14:48:10 UTC (rev 5374)
+++ stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2007-12-20 14:55:00 UTC (rev 5375)
@@ -29,6 +29,15 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>org.apache.cxf</value>
+ </list>
+ </property>
+ </bean>
+
<!--
The stack specific deployment aspects
-->
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2007-12-20 14:48:10 UTC (rev 5374)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2007-12-20 14:55:00 UTC (rev 5375)
@@ -1,28 +1,30 @@
/*
- * 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.
- */
+ * 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.jaxws.cxf.descriptor;
// $Id$
+import java.util.logging.Logger;
+
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
@@ -31,9 +33,19 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class DescriptorEndpointImpl
{
+ private Logger jdklog = Logger.getLogger("org.apache.cxf.foo");
+
@WebMethod
public String echo(String input)
{
+ // Test jdk logging redirection to jboss logging
+ jdklog.severe("SEVERE: " + input);
+ jdklog.warning("WARNING: " + input);
+ jdklog.info("INFO: " + input);
+ jdklog.fine("FINE: " + input);
+ jdklog.finer("FINER: " + input);
+ jdklog.finest("FINEST: " + input);
+
return input;
}
}
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java 2007-12-20 14:48:10 UTC (rev 5374)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java 2007-12-20 14:55:00 UTC (rev 5375)
@@ -25,7 +25,7 @@
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.jboss.wsf.common.log.JBossLogHandler;
+import org.jboss.wsf.common.logging.JDKLogHandler;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -52,7 +52,7 @@
int found = 0;
for (Handler handler : log.getHandlers())
{
- if (handler instanceof JBossLogHandler)
+ if (handler instanceof JDKLogHandler)
found++;
}
assertEquals("Expected one jboss handler", 1, found);
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2007-12-20 14:48:10 UTC (rev 5374)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2007-12-20 14:55:00 UTC (rev 5375)
@@ -24,7 +24,7 @@
import java.util.logging.Handler;
import java.util.logging.Logger;
-import org.jboss.wsf.common.log.JBossLogHandler;
+import org.jboss.wsf.common.logging.JDKLogHandler;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -51,7 +51,7 @@
int found = 0;
for (Handler handler : log.getHandlers())
{
- if (handler instanceof JBossLogHandler)
+ if (handler instanceof JDKLogHandler)
found++;
}
assertEquals("Expected one jboss handler", 1, found);
Modified: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml 2007-12-20 14:48:10 UTC (rev 5374)
+++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml 2007-12-20 14:55:00 UTC (rev 5375)
@@ -15,17 +15,14 @@
</wsp:Policy>
<jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-reliable' implementor='org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl'>
-
<jaxws:invoker>
<bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
</jaxws:invoker>
-
<jaxws:features>
<p:policies namespace="http://www.w3.org/2006/07/ws-policy">
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
</p:policies>
</jaxws:features>
-
</jaxws:endpoint>
</beans>
\ No newline at end of file
16 years, 4 months
- 1
- 0
JBossWS SVN: r5374 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 09:48:10 -0500 (Thu, 20 Dec 2007)
New Revision: 5374
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
Use org.jboss.wsf.common.logging
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-12-20 14:45:18 UTC (rev 5373)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-12-20 14:48:10 UTC (rev 5374)
@@ -482,7 +482,7 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
<sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.log.JBossLogManager"/>
+ <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
@@ -525,7 +525,7 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
<sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.log.JBossLogManager"/>
+ <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
16 years, 4 months
- 1
- 0
JBossWS SVN: r5373 - in common/trunk/src/main/java/org/jboss/wsf/common: logging and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 09:45:18 -0500 (Thu, 20 Dec 2007)
New Revision: 5373
Added:
common/trunk/src/main/java/org/jboss/wsf/common/logging/
common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogHandler.java
common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogManager.java
common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java
common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogger.java
Removed:
common/trunk/src/main/java/org/jboss/wsf/common/log/
common/trunk/src/main/java/org/jboss/wsf/common/logging/JBossLogHandler.java
common/trunk/src/main/java/org/jboss/wsf/common/logging/JBossLogManager.java
common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java
common/trunk/src/main/java/org/jboss/wsf/common/logging/NamespaceFilter.java
Log:
Fix server side jdk trace logging
Copied: common/trunk/src/main/java/org/jboss/wsf/common/logging (from rev 5364, common/trunk/src/main/java/org/jboss/wsf/common/log)
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/logging/JBossLogHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java 2007-12-20 09:26:55 UTC (rev 5364)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JBossLogHandler.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -1,148 +0,0 @@
-/*
- * 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.common.log;
-
-// $Id$
-
-import java.util.logging.ErrorManager;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.SimpleFormatter;
-
-import org.jboss.logging.Logger;
-
-/**
- * A Handler (java.util.logging.Handler) class redirecting messages
- * to the jboss logging system.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @author Thomas.Diesler(a)jboss.com
- * @since 14-Jun-2007
- */
-public class JBossLogHandler extends Handler
-{
- public JBossLogHandler()
- {
- super.setFormatter(new SimpleFormatter());
- }
-
- @Override
- public void publish(LogRecord record)
- {
- if (isLoggable(record))
- {
- Logger logger = getJBossLogger(record);
- Level level = record.getLevel();
- if (level == Level.FINER || level == Level.FINEST)
- {
- String msg = getMessage(record);
- logger.trace(msg);
- }
- else if (level == Level.FINE)
- {
- String msg = getMessage(record);
- logger.debug(msg);
- }
- else if (level == Level.INFO || level == Level.CONFIG)
- {
- String msg = getMessage(record);
- logger.info(msg);
- }
- else if (level == Level.WARNING)
- {
- String msg = getMessage(record);
- logger.warn(msg);
- }
- else if (level == Level.SEVERE)
- {
- String msg = getMessage(record);
- logger.error(msg);
- }
- else if (level == Level.OFF)
- {
- // do nothing
- }
- }
- }
-
- private Logger getJBossLogger(LogRecord record)
- {
- return Logger.getLogger(record.getLoggerName());
- }
-
- private String getMessage(LogRecord record)
- {
- String msg = null;
- try
- {
- msg = getFormatter().formatMessage(record);
- }
- catch (Exception ex)
- {
- // We don't want to throw an exception here, but we
- // report the exception to any registered ErrorManager.
- reportError("Cannot obtain message from log record", ex, ErrorManager.FORMAT_FAILURE);
- }
- return msg;
- }
-
- @Override
- public boolean isLoggable(LogRecord record)
- {
- Logger logger = getJBossLogger(record);
- Level level = record.getLevel();
-
- boolean isLoggable = false;
- if (level == Level.FINER || level == Level.FINEST)
- {
- isLoggable = logger.isTraceEnabled();
- }
- else if (level == Level.FINE)
- {
- isLoggable = logger.isDebugEnabled();
- }
- else if (level == Level.INFO || level == Level.CONFIG)
- {
- isLoggable = logger.isInfoEnabled();
- }
- else if (level == Level.SEVERE || level == Level.WARNING)
- {
- isLoggable = true;
- }
- return isLoggable;
- }
-
- @Override
- public void flush()
- {
- //nothing to do
- }
-
- @Override
- public void close() throws SecurityException
- {
- //nothing to do
- }
-
-}
\ No newline at end of file
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/logging/JBossLogManager.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-20 09:26:55 UTC (rev 5364)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JBossLogManager.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -1,70 +0,0 @@
-/*
- * 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.common.log;
-
-// $Id$
-
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-/**
- * A LogManager that adds a JBossLogHandler to every Logger
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 18-Dec-2007
- */
-public class JBossLogManager extends LogManager
-{
- @Override
- public synchronized Logger getLogger(String name)
- {
- Logger logger = super.getLogger(name);
- if (logger == null)
- logger = new JBossLogger(name);
-
- logger.addHandler(new JBossLogHandler());
- return logger;
- }
-
- static class JBossLogger extends Logger
- {
- protected JBossLogger(String name)
- {
- super(name, null);
-
- org.jboss.logging.Logger jbl = org.jboss.logging.Logger.getLogger(name);
- if (jbl.isTraceEnabled())
- {
- setLevel(Level.FINEST);
- }
- else if (jbl.isDebugEnabled())
- {
- setLevel(Level.FINE);
- }
- else if (jbl.isInfoEnabled())
- {
- setLevel(Level.INFO);
- }
- }
- }
-}
\ No newline at end of file
Copied: common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogHandler.java (from rev 5372, common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogHandler.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogHandler.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogHandler.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -0,0 +1,148 @@
+/*
+ * 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.common.logging;
+
+// $Id$
+
+import java.util.logging.ErrorManager;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.SimpleFormatter;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A Handler (java.util.logging.Handler) class redirecting messages
+ * to the jboss logging system.
+ *
+ * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
+ * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 14-Jun-2007
+ */
+public class JDKLogHandler extends Handler
+{
+ public JDKLogHandler()
+ {
+ super.setFormatter(new SimpleFormatter());
+ }
+
+ @Override
+ public void publish(LogRecord record)
+ {
+ if (isLoggable(record))
+ {
+ Logger logger = getJBossLogger(record);
+ Level level = record.getLevel();
+ if (level == Level.FINER || level == Level.FINEST)
+ {
+ String msg = getMessage(record);
+ logger.trace(msg);
+ }
+ else if (level == Level.FINE)
+ {
+ String msg = getMessage(record);
+ logger.debug(msg);
+ }
+ else if (level == Level.INFO || level == Level.CONFIG)
+ {
+ String msg = getMessage(record);
+ logger.info(msg);
+ }
+ else if (level == Level.WARNING)
+ {
+ String msg = getMessage(record);
+ logger.warn(msg);
+ }
+ else if (level == Level.SEVERE)
+ {
+ String msg = getMessage(record);
+ logger.error(msg);
+ }
+ else if (level == Level.OFF)
+ {
+ // do nothing
+ }
+ }
+ }
+
+ private Logger getJBossLogger(LogRecord record)
+ {
+ return Logger.getLogger(record.getLoggerName());
+ }
+
+ private String getMessage(LogRecord record)
+ {
+ String msg = null;
+ try
+ {
+ msg = getFormatter().formatMessage(record);
+ }
+ catch (Exception ex)
+ {
+ // We don't want to throw an exception here, but we
+ // report the exception to any registered ErrorManager.
+ reportError("Cannot obtain message from log record", ex, ErrorManager.FORMAT_FAILURE);
+ }
+ return msg;
+ }
+
+ @Override
+ public boolean isLoggable(LogRecord record)
+ {
+ Logger logger = getJBossLogger(record);
+ Level level = record.getLevel();
+
+ boolean isLoggable = false;
+ if (level == Level.FINER || level == Level.FINEST)
+ {
+ isLoggable = logger.isTraceEnabled();
+ }
+ else if (level == Level.FINE)
+ {
+ isLoggable = logger.isDebugEnabled();
+ }
+ else if (level == Level.INFO || level == Level.CONFIG)
+ {
+ isLoggable = logger.isInfoEnabled();
+ }
+ else if (level == Level.SEVERE || level == Level.WARNING)
+ {
+ isLoggable = true;
+ }
+ return isLoggable;
+ }
+
+ @Override
+ public void flush()
+ {
+ //nothing to do
+ }
+
+ @Override
+ public void close() throws SecurityException
+ {
+ //nothing to do
+ }
+
+}
\ No newline at end of file
Copied: common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogManager.java (from rev 5372, common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogManager.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogManager.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogManager.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -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.common.logging;
+
+// $Id$
+
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+/**
+ * A LogManager that adds a JBossLogHandler to every Logger
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 18-Dec-2007
+ */
+public class JDKLogManager extends LogManager
+{
+ @Override
+ public synchronized Logger getLogger(String name)
+ {
+ Logger logger = super.getLogger(name);
+ if (logger == null)
+ logger = new JDKLogger(name);
+
+ logger.addHandler(new JDKLogHandler());
+ return logger;
+ }
+}
\ No newline at end of file
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java 2007-12-20 09:26:55 UTC (rev 5364)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -1,113 +0,0 @@
-/*
- * 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.common.log;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.Filter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.log.JBossLogHandler;
-
-/**
- * Redirects JDK Logger output to the JBoss Logger.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @since 14-Jun-2007
- *
- */
-public class JDKLogRedirector
-{
- private List<String> namespaces = new LinkedList<String>();
-
- public JDKLogRedirector()
- {
- }
-
- public void changeHandlers()
- {
- for (String ns : namespaces)
- {
- changeHandler(ns);
- }
- }
-
- /**
- * Modifies the jdk root logger in order not to log records coming from
- * loggers with the provided namespace; these records are then logged
- * through the JBoss Logger.
- *
- * @param ns
- */
- public void changeHandler(String ns)
- {
- if (ns == null)
- ns = "";
- Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns);
- java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger("");
- Handler[] handlers = jdkRootLogger.getHandlers();
- for (int i = 0; i < handlers.length; i++)
- {
- Handler handler = handlers[i];
- if (!(handler instanceof JBossLogHandler))
- {
- StringBuffer sb = new StringBuffer("Disableing handler ");
- sb.append(handler).append(" with level ").append(handler.getLevel());
- Logger.getLogger(this.getClass()).debug(sb);
- Filter f = handler.getFilter();
- if (f != null && f instanceof NamespaceFilter)
- {
- ((NamespaceFilter)f).addNamespace(ns);
- }
- else
- {
- NamespaceFilter nsFilter = new NamespaceFilter(false);
- nsFilter.addNamespace(ns);
- handler.setFilter(nsFilter);
- }
- }
- }
- Handler jbossLogHandler = new JBossLogHandler();
- jbossLogHandler.setLevel(Level.ALL);
- java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler);
- }
-
- public void addNamespace(String ns)
- {
- namespaces.add(ns);
- changeHandler(ns);
- }
-
- public List<String> getNamespaces()
- {
- return namespaces;
- }
-
- public void setNamespaces(List<String> namespaces)
- {
- this.namespaces = namespaces;
- changeHandlers();
- }
-}
Copied: common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java (from rev 5372, common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -0,0 +1,90 @@
+/*
+ * 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.common.logging;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+/**
+ * Redirects JDK Logger output to the JBoss Logger.
+ *
+ * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
+ * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 14-Jun-2007
+ */
+public class JDKLogRedirector
+{
+ private List<String> namespaces = new LinkedList<String>();
+
+ public void addNamespace(String ns)
+ {
+ namespaces.add(ns);
+ }
+
+ public List<String> getNamespaces()
+ {
+ return namespaces;
+ }
+
+ public void setNamespaces(List<String> namespaces)
+ {
+ this.namespaces = namespaces;
+ }
+
+ public void start()
+ {
+ removeRootConsoleHandler();
+ addNamespaceHandlers();
+ }
+
+ private void removeRootConsoleHandler()
+ {
+ LogManager logManager = LogManager.getLogManager();
+ Logger root = logManager.getLogger("");
+ while (root.getParent() != null)
+ root = root.getParent();
+
+ Handler[] handlers = root.getHandlers();
+ for (int i = 0; i < handlers.length; i++)
+ {
+ Handler handler = handlers[i];
+ if (handler instanceof ConsoleHandler)
+ root.removeHandler(handler);
+ }
+ }
+
+ private void addNamespaceHandlers()
+ {
+ LogManager logManager = LogManager.getLogManager();
+ for (String ns : namespaces)
+ {
+ JDKLogger log = new JDKLogger(ns);
+ log.addHandler(new JDKLogHandler());
+ logManager.addLogger(log);
+ }
+ }
+}
Copied: common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogger.java (from rev 5372, common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogger.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogger.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogger.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -0,0 +1,55 @@
+/*
+ * 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.common.logging;
+
+// $Id$
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * A LogManager that adds a JBossLogHandler to every Logger
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 18-Dec-2007
+ */
+public class JDKLogger extends Logger
+{
+ protected JDKLogger(String name)
+ {
+ super(name, null);
+
+ org.jboss.logging.Logger jbl = org.jboss.logging.Logger.getLogger(name);
+ if (jbl.isTraceEnabled())
+ {
+ setLevel(Level.FINEST);
+ }
+ else if (jbl.isDebugEnabled())
+ {
+ setLevel(Level.FINE);
+ }
+ else if (jbl.isInfoEnabled())
+ {
+ setLevel(Level.INFO);
+ }
+ }
+}
\ No newline at end of file
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/logging/NamespaceFilter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/NamespaceFilter.java 2007-12-20 09:26:55 UTC (rev 5364)
+++ common/trunk/src/main/java/org/jboss/wsf/common/logging/NamespaceFilter.java 2007-12-20 14:45:18 UTC (rev 5373)
@@ -1,96 +0,0 @@
-/*
- * 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.common.log;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.logging.Filter;
-import java.util.logging.LogRecord;
-
-/**
- * A log filter allowing logging of LogRecord depending on the
- * namespace of the Logger they have been collected by.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @since 14-Jun-2007
- *
- */
-public class NamespaceFilter implements Filter
-{
-
- private Set<String> namespaces;
- private boolean show;
-
- public NamespaceFilter(boolean show)
- {
- this.show = show;
- }
-
- public boolean isLoggable(LogRecord record)
- {
- String loggerName = record.getLoggerName();
- if (loggerName == null)
- {
- return true;
- }
- else
- {
- for (String ns : namespaces)
- {
- if (loggerName.startsWith(ns))
- {
- return show;
- }
- }
- return !show;
- }
- }
-
- public void addNamespace(String ns)
- {
- if (namespaces == null)
- namespaces = new LinkedHashSet<String>();
- namespaces.add(ns);
- }
-
- public Set<String> getNamespaces()
- {
- return namespaces;
- }
-
- public void setNamespaces(Set<String> namespaces)
- {
- this.namespaces = namespaces;
- }
-
- public boolean isShow()
- {
- return show;
- }
-
- public void setShow(boolean show)
- {
- this.show = show;
- }
-
-}
16 years, 4 months
- 1
- 0
JBossWS SVN: r5372 - common/trunk/src/main/java/org/jboss/wsf/common/log.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 09:42:37 -0500 (Thu, 20 Dec 2007)
New Revision: 5372
Added:
common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogHandler.java
common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogManager.java
common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogger.java
Removed:
common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java
common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java
Log:
Fix server side jdk logger tracing
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java 2007-12-20 13:59:15 UTC (rev 5371)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java 2007-12-20 14:42:37 UTC (rev 5372)
@@ -1,148 +0,0 @@
-/*
- * 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.common.log;
-
-// $Id$
-
-import java.util.logging.ErrorManager;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.SimpleFormatter;
-
-import org.jboss.logging.Logger;
-
-/**
- * A Handler (java.util.logging.Handler) class redirecting messages
- * to the jboss logging system.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @author Thomas.Diesler(a)jboss.com
- * @since 14-Jun-2007
- */
-public class JBossLogHandler extends Handler
-{
- public JBossLogHandler()
- {
- super.setFormatter(new SimpleFormatter());
- }
-
- @Override
- public void publish(LogRecord record)
- {
- if (isLoggable(record))
- {
- Logger logger = getJBossLogger(record);
- Level level = record.getLevel();
- if (level == Level.FINER || level == Level.FINEST)
- {
- String msg = getMessage(record);
- logger.trace(msg);
- }
- else if (level == Level.FINE)
- {
- String msg = getMessage(record);
- logger.debug(msg);
- }
- else if (level == Level.INFO || level == Level.CONFIG)
- {
- String msg = getMessage(record);
- logger.info(msg);
- }
- else if (level == Level.WARNING)
- {
- String msg = getMessage(record);
- logger.warn(msg);
- }
- else if (level == Level.SEVERE)
- {
- String msg = getMessage(record);
- logger.error(msg);
- }
- else if (level == Level.OFF)
- {
- // do nothing
- }
- }
- }
-
- private Logger getJBossLogger(LogRecord record)
- {
- return Logger.getLogger(record.getLoggerName());
- }
-
- private String getMessage(LogRecord record)
- {
- String msg = null;
- try
- {
- msg = getFormatter().formatMessage(record);
- }
- catch (Exception ex)
- {
- // We don't want to throw an exception here, but we
- // report the exception to any registered ErrorManager.
- reportError("Cannot obtain message from log record", ex, ErrorManager.FORMAT_FAILURE);
- }
- return msg;
- }
-
- @Override
- public boolean isLoggable(LogRecord record)
- {
- Logger logger = getJBossLogger(record);
- Level level = record.getLevel();
-
- boolean isLoggable = false;
- if (level == Level.FINER || level == Level.FINEST)
- {
- isLoggable = logger.isTraceEnabled();
- }
- else if (level == Level.FINE)
- {
- isLoggable = logger.isDebugEnabled();
- }
- else if (level == Level.INFO || level == Level.CONFIG)
- {
- isLoggable = logger.isInfoEnabled();
- }
- else if (level == Level.SEVERE || level == Level.WARNING)
- {
- isLoggable = true;
- }
- return isLoggable;
- }
-
- @Override
- public void flush()
- {
- //nothing to do
- }
-
- @Override
- public void close() throws SecurityException
- {
- //nothing to do
- }
-
-}
\ No newline at end of file
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-20 13:59:15 UTC (rev 5371)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-20 14:42:37 UTC (rev 5372)
@@ -1,70 +0,0 @@
-/*
- * 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.common.log;
-
-// $Id$
-
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-/**
- * A LogManager that adds a JBossLogHandler to every Logger
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 18-Dec-2007
- */
-public class JBossLogManager extends LogManager
-{
- @Override
- public synchronized Logger getLogger(String name)
- {
- Logger logger = super.getLogger(name);
- if (logger == null)
- logger = new JBossLogger(name);
-
- logger.addHandler(new JBossLogHandler());
- return logger;
- }
-
- static class JBossLogger extends Logger
- {
- protected JBossLogger(String name)
- {
- super(name, null);
-
- org.jboss.logging.Logger jbl = org.jboss.logging.Logger.getLogger(name);
- if (jbl.isTraceEnabled())
- {
- setLevel(Level.FINEST);
- }
- else if (jbl.isDebugEnabled())
- {
- setLevel(Level.FINE);
- }
- else if (jbl.isInfoEnabled())
- {
- setLevel(Level.INFO);
- }
- }
- }
-}
\ No newline at end of file
Copied: common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogHandler.java (from rev 5364, common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogHandler.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogHandler.java 2007-12-20 14:42:37 UTC (rev 5372)
@@ -0,0 +1,148 @@
+/*
+ * 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.common.log;
+
+// $Id$
+
+import java.util.logging.ErrorManager;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.SimpleFormatter;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A Handler (java.util.logging.Handler) class redirecting messages
+ * to the jboss logging system.
+ *
+ * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
+ * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 14-Jun-2007
+ */
+public class JDKLogHandler extends Handler
+{
+ public JDKLogHandler()
+ {
+ super.setFormatter(new SimpleFormatter());
+ }
+
+ @Override
+ public void publish(LogRecord record)
+ {
+ if (isLoggable(record))
+ {
+ Logger logger = getJBossLogger(record);
+ Level level = record.getLevel();
+ if (level == Level.FINER || level == Level.FINEST)
+ {
+ String msg = getMessage(record);
+ logger.trace(msg);
+ }
+ else if (level == Level.FINE)
+ {
+ String msg = getMessage(record);
+ logger.debug(msg);
+ }
+ else if (level == Level.INFO || level == Level.CONFIG)
+ {
+ String msg = getMessage(record);
+ logger.info(msg);
+ }
+ else if (level == Level.WARNING)
+ {
+ String msg = getMessage(record);
+ logger.warn(msg);
+ }
+ else if (level == Level.SEVERE)
+ {
+ String msg = getMessage(record);
+ logger.error(msg);
+ }
+ else if (level == Level.OFF)
+ {
+ // do nothing
+ }
+ }
+ }
+
+ private Logger getJBossLogger(LogRecord record)
+ {
+ return Logger.getLogger(record.getLoggerName());
+ }
+
+ private String getMessage(LogRecord record)
+ {
+ String msg = null;
+ try
+ {
+ msg = getFormatter().formatMessage(record);
+ }
+ catch (Exception ex)
+ {
+ // We don't want to throw an exception here, but we
+ // report the exception to any registered ErrorManager.
+ reportError("Cannot obtain message from log record", ex, ErrorManager.FORMAT_FAILURE);
+ }
+ return msg;
+ }
+
+ @Override
+ public boolean isLoggable(LogRecord record)
+ {
+ Logger logger = getJBossLogger(record);
+ Level level = record.getLevel();
+
+ boolean isLoggable = false;
+ if (level == Level.FINER || level == Level.FINEST)
+ {
+ isLoggable = logger.isTraceEnabled();
+ }
+ else if (level == Level.FINE)
+ {
+ isLoggable = logger.isDebugEnabled();
+ }
+ else if (level == Level.INFO || level == Level.CONFIG)
+ {
+ isLoggable = logger.isInfoEnabled();
+ }
+ else if (level == Level.SEVERE || level == Level.WARNING)
+ {
+ isLoggable = true;
+ }
+ return isLoggable;
+ }
+
+ @Override
+ public void flush()
+ {
+ //nothing to do
+ }
+
+ @Override
+ public void close() throws SecurityException
+ {
+ //nothing to do
+ }
+
+}
\ No newline at end of file
Copied: common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogManager.java (from rev 5364, common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogManager.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogManager.java 2007-12-20 14:42:37 UTC (rev 5372)
@@ -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.common.log;
+
+// $Id$
+
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+/**
+ * A LogManager that adds a JBossLogHandler to every Logger
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 18-Dec-2007
+ */
+public class JDKLogManager extends LogManager
+{
+ @Override
+ public synchronized Logger getLogger(String name)
+ {
+ Logger logger = super.getLogger(name);
+ if (logger == null)
+ logger = new JDKLogger(name);
+
+ logger.addHandler(new JDKLogHandler());
+ return logger;
+ }
+}
\ No newline at end of file
Modified: common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java 2007-12-20 13:59:15 UTC (rev 5371)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java 2007-12-20 14:42:37 UTC (rev 5372)
@@ -23,91 +23,68 @@
import java.util.LinkedList;
import java.util.List;
-import java.util.logging.Filter;
+import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
-import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.log.JBossLogHandler;
-
/**
* Redirects JDK Logger output to the JBoss Logger.
*
* @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
* @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
+ * @author Thomas.Diesler(a)jboss.com
* @since 14-Jun-2007
- *
*/
public class JDKLogRedirector
{
private List<String> namespaces = new LinkedList<String>();
- public JDKLogRedirector()
+ public void addNamespace(String ns)
{
+ namespaces.add(ns);
}
- public void changeHandlers()
+ public List<String> getNamespaces()
{
- for (String ns : namespaces)
- {
- changeHandler(ns);
- }
+ return namespaces;
}
- /**
- * Modifies the jdk root logger in order not to log records coming from
- * loggers with the provided namespace; these records are then logged
- * through the JBoss Logger.
- *
- * @param ns
- */
- public void changeHandler(String ns)
+ public void setNamespaces(List<String> namespaces)
{
- if (ns == null)
- ns = "";
- Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns);
- java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger("");
- Handler[] handlers = jdkRootLogger.getHandlers();
- for (int i = 0; i < handlers.length; i++)
- {
- Handler handler = handlers[i];
- if (!(handler instanceof JBossLogHandler))
- {
- StringBuffer sb = new StringBuffer("Disableing handler ");
- sb.append(handler).append(" with level ").append(handler.getLevel());
- Logger.getLogger(this.getClass()).debug(sb);
- Filter f = handler.getFilter();
- if (f != null && f instanceof NamespaceFilter)
- {
- ((NamespaceFilter)f).addNamespace(ns);
- }
- else
- {
- NamespaceFilter nsFilter = new NamespaceFilter(false);
- nsFilter.addNamespace(ns);
- handler.setFilter(nsFilter);
- }
- }
- }
- Handler jbossLogHandler = new JBossLogHandler();
- jbossLogHandler.setLevel(Level.ALL);
- java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler);
+ this.namespaces = namespaces;
}
- public void addNamespace(String ns)
+ public void start()
{
- namespaces.add(ns);
- changeHandler(ns);
+ removeRootConsoleHandler();
+ addNamespaceHandlers();
}
- public List<String> getNamespaces()
+ private void removeRootConsoleHandler()
{
- return namespaces;
+ LogManager logManager = LogManager.getLogManager();
+ Logger root = logManager.getLogger("");
+ while (root.getParent() != null)
+ root = root.getParent();
+
+ Handler[] handlers = root.getHandlers();
+ for (int i = 0; i < handlers.length; i++)
+ {
+ Handler handler = handlers[i];
+ if (handler instanceof ConsoleHandler)
+ root.removeHandler(handler);
+ }
}
- public void setNamespaces(List<String> namespaces)
+ private void addNamespaceHandlers()
{
- this.namespaces = namespaces;
- changeHandlers();
+ LogManager logManager = LogManager.getLogManager();
+ for (String ns : namespaces)
+ {
+ JDKLogger log = new JDKLogger(ns);
+ log.addHandler(new JDKLogHandler());
+ logManager.addLogger(log);
+ }
}
}
Added: common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogger.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogger.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogger.java 2007-12-20 14:42:37 UTC (rev 5372)
@@ -0,0 +1,55 @@
+/*
+ * 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.common.log;
+
+// $Id$
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * A LogManager that adds a JBossLogHandler to every Logger
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 18-Dec-2007
+ */
+public class JDKLogger extends Logger
+{
+ protected JDKLogger(String name)
+ {
+ super(name, null);
+
+ org.jboss.logging.Logger jbl = org.jboss.logging.Logger.getLogger(name);
+ if (jbl.isTraceEnabled())
+ {
+ setLevel(Level.FINEST);
+ }
+ else if (jbl.isDebugEnabled())
+ {
+ setLevel(Level.FINE);
+ }
+ else if (jbl.isInfoEnabled())
+ {
+ setLevel(Level.INFO);
+ }
+ }
+}
\ No newline at end of file
Property changes on: common/trunk/src/main/java/org/jboss/wsf/common/log/JDKLogger.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 4 months
- 1
- 0
JBossWS SVN: r5371 - stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-20 08:59:15 -0500 (Thu, 20 Dec 2007)
New Revision: 5371
Added:
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalcIF.java
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java
Modified:
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java
Log:
Added RM test case
Added: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalcIF.java
===================================================================
--- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalcIF.java (rev 0)
+++ stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalcIF.java 2007-12-20 13:59:15 UTC (rev 5371)
@@ -0,0 +1,12 @@
+package org.jboss.test.ws.wsit.rm;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://calculator.me.org/", portName = "CalculatorWS")
+public interface CalcIF
+{
+ @WebMethod(operationName = "add")
+ public int add(@WebParam(name = "i") int i, @WebParam(name = "j") int j);
+}
Property changes on: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalcIF.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java
===================================================================
--- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java 2007-12-20 13:17:47 UTC (rev 5370)
+++ stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java 2007-12-20 13:59:15 UTC (rev 5371)
@@ -39,7 +39,8 @@
* @author User
*/
@WebService(targetNamespace = "http://calculator.me.org/")
-public class CalculatorWS {
+public class CalculatorWS implements CalcIF
+{
/**
* Web service operation
Added: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java
===================================================================
--- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java (rev 0)
+++ stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2007-12-20 13:59:15 UTC (rev 5371)
@@ -0,0 +1,35 @@
+package org.jboss.test.ws.wsit.rm;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import javax.xml.ws.Service;
+import javax.xml.namespace.QName;
+import java.net.URL;
+
+
+public class RMTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(RMTestCase.class, "wsit-rm.war");
+ }
+
+ public void testRMExchange() throws Exception
+ {
+ Service service = Service.create(
+ new URL("http://"+getServerHost()+":8080/wsit-rm?wsdl"),
+ new QName("http://calculator.me.org/","CalculatorWSService")
+ );
+
+ CalcIF port = service.getPort(new QName("http://calculator.me.org/","CalculatorWSPort"), CalcIF.class);
+
+ int i = 10;
+ int j = 20;
+
+ int result = port.add(i, j);
+ assertTrue(result == 30);
+ }
+}
+
Property changes on: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 4 months
- 1
- 0
JBossWS SVN: r5370 - in stack/metro/branches/hbraun: ant-import and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-20 08:17:47 -0500 (Thu, 20 Dec 2007)
New Revision: 5370
Added:
stack/metro/branches/hbraun/Metro-Branch.ipr
stack/metro/branches/hbraun/ant-import-tests/
stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml
stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml
stack/metro/branches/hbraun/ant-import/build-metro.xml
stack/metro/branches/hbraun/ant-import/metro-build-adapter.xml
stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java
stack/metro/branches/hbraun/src/test/java/org/
stack/metro/branches/hbraun/src/test/java/org/jboss/
stack/metro/branches/hbraun/src/test/java/org/jboss/test/
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java
stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java
stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss423.txt
stack/metro/branches/hbraun/src/test/resources/wsit/
stack/metro/branches/hbraun/src/test/resources/wsit/rm/
stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/
stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml
stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml
stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsdl/
stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWS.xml
Modified:
stack/metro/branches/hbraun/ant-import/build-bin-dist.xml
stack/metro/branches/hbraun/ant-import/build-deploy.xml
stack/metro/branches/hbraun/ant-import/build-setup.xml
stack/metro/branches/hbraun/ant-import/build-testsuite.xml
stack/metro/branches/hbraun/ant-import/build-thirdparty.xml
stack/metro/branches/hbraun/ant-import/macros-deploy-sunri.xml
stack/metro/branches/hbraun/ant.properties.example
stack/metro/branches/hbraun/build.xml
stack/metro/branches/hbraun/src/main/distro/ant.properties.example
stack/metro/branches/hbraun/src/main/distro/bin-dist-build.xml
stack/metro/branches/hbraun/src/main/distro/bin-dist-deploy.xml
stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java
stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java
stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss500.txt
stack/metro/branches/hbraun/version.properties
Log:
metro integration, first cut
Added: stack/metro/branches/hbraun/Metro-Branch.ipr
===================================================================
--- stack/metro/branches/hbraun/Metro-Branch.ipr (rev 0)
+++ stack/metro/branches/hbraun/Metro-Branch.ipr 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4" relativePaths="false">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ </component>
+ <component name="BuildJarProjectSettings">
+ <option name="BUILD_JARS_ON_MAKE" value="false" />
+ </component>
+ <component name="CodeStyleProjectProfileManger">
+ <option name="PROJECT_PROFILE" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ </component>
+ <component name="CodeStyleSettingsManager">
+ <option name="PER_PROJECT_SETTINGS" />
+ <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+ </component>
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <option name="DEPLOY_AFTER_MAKE" value="0" />
+ <resourceExtensions>
+ <entry name=".+\.(properties|xml|html|dtd|tld)" />
+ <entry name=".+\.(gif|png|jpeg|jpg)" />
+ </resourceExtensions>
+ <wildcardResourcePatterns>
+ <entry name="?*.properties" />
+ <entry name="?*.xml" />
+ <entry name="?*.gif" />
+ <entry name="?*.png" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
+ <entry name="?*.html" />
+ <entry name="?*.dtd" />
+ <entry name="?*.tld" />
+ </wildcardResourcePatterns>
+ </component>
+ <component name="DataSourceManagerImpl" />
+ <component name="DependenciesAnalyzeManager">
+ <option name="myForwardDirection" value="false" />
+ </component>
+ <component name="DependencyValidationManager" />
+ <component name="EclipseCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="EclipseEmbeddedCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="EntryPointsManager">
+ <entry_points />
+ </component>
+ <component name="ExportToHTMLSettings">
+ <option name="PRINT_LINE_NUMBERS" value="false" />
+ <option name="OPEN_IN_BROWSER" value="false" />
+ <option name="OUTPUT_DIRECTORY" />
+ </component>
+ <component name="GUI Designer component loader factory" />
+ <component name="IdProvider" IDEtalkID="130CB95840D679D1651689A38EB02B70" />
+ <component name="InspectionProjectProfileManager">
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ <scopes />
+ <profiles>
+ <profile version="1.0" is_locked="false">
+ <option name="myName" value="Project Default" />
+ <option name="myLocal" value="false" />
+ <used_levels>
+ <error>
+ <option name="myName" value="ERROR" />
+ <option name="myVal" value="400" />
+ </error>
+ <warning>
+ <option name="myName" value="WARNING" />
+ <option name="myVal" value="300" />
+ </warning>
+ <information>
+ <option name="myName" value="INFO" />
+ <option name="myVal" value="200" />
+ </information>
+ <server>
+ <option name="myName" value="SERVER PROBLEM" />
+ <option name="myVal" value="100" />
+ </server>
+ </used_levels>
+ </profile>
+ </profiles>
+ </component>
+ <component name="JavacSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="DEPRECATION" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="JavadocGenerationManager">
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="OPTION_SCOPE" value="protected" />
+ <option name="OPTION_HIERARCHY" value="true" />
+ <option name="OPTION_NAVIGATOR" value="true" />
+ <option name="OPTION_INDEX" value="true" />
+ <option name="OPTION_SEPARATE_INDEX" value="true" />
+ <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+ <option name="OPTION_DEPRECATED_LIST" value="true" />
+ <option name="OTHER_OPTIONS" value="" />
+ <option name="HEAP_SIZE" />
+ <option name="LOCALE" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ </component>
+ <component name="JikesSettings">
+ <option name="JIKES_PATH" value="" />
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="DEPRECATION" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="IS_EMACS_ERRORS_MODE" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </component>
+ <component name="LogConsolePreferences">
+ <option name="FILTER_ERRORS" value="false" />
+ <option name="FILTER_WARNINGS" value="false" />
+ <option name="FILTER_INFO" value="true" />
+ <option name="CUSTOM_FILTER" />
+ </component>
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/Metro-Branch.iml" filepath="$PROJECT_DIR$/Metro-Branch.iml" />
+ <module fileurl="file://$PROJECT_DIR$/cvs/cvs-metro.iml" filepath="$PROJECT_DIR$/cvs/cvs-metro.iml" />
+ </modules>
+ </component>
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/classes" />
+ </component>
+ <component name="ProjectRunConfigurationManager" />
+ <component name="RmicSettings">
+ <option name="IS_EANABLED" value="false" />
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="GENERATE_IIOP_STUBS" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </component>
+ <component name="StarteamVcsAdapter" />
+ <component name="VssVcs" />
+ <component name="com.intellij.jsf.UserDefinedFacesConfigs">
+ <option name="USER_DEFINED_CONFIGS">
+ <value>
+ <list size="0" />
+ </value>
+ </option>
+ </component>
+ <component name="libraryTable" />
+ <component name="uidesigner-configuration">
+ <option name="INSTRUMENT_CLASSES" value="true" />
+ <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+ <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
+ </component>
+ <UsedPathMacros />
+</project>
+
Modified: stack/metro/branches/hbraun/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-bin-dist.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant-import/build-bin-dist.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -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/branches/hbraun/ant-import/build-deploy.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-deploy.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant-import/build-deploy.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -17,41 +17,63 @@
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
<!-- ================================================================== -->
- <!-- Deployment -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
- <!-- Deploy to jboss50 -->
- <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
- <macro-deploy-sunri500
+ <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri422
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss500.home}"/>
+ jbosshome="${jboss422.home}"/>
</target>
- <!-- Remove from jboss50 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri500/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ <!-- Remove from jboss422 -->
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri422/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
- <!-- Deploy to jboss42 -->
- <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri422
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri423
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss422.home}"/>
+ jbosshome="${jboss423.home}"/>
</target>
- <!-- Remove from jboss42 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri422/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ <!-- Remove from jboss423 -->
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri423/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
+ <macro-deploy-sunri500
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.sunri.dir}/thirdparty"
+ jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- Remove from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ </target>
+
</project>
Added: stack/metro/branches/hbraun/ant-import/build-metro.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-metro.xml (rev 0)
+++ stack/metro/branches/hbraun/ant-import/build-metro.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project basedir="." name="Build-Metro">
+
+
+ <property name="cvs.user" value="heiko_braun"/>
+ <property name="cvs.tag" value="WSIT-1_0-BRANCH"/>
+ <property name="cvs.dir" value="cvs"/>
+ <property name="metro.dir" value="${cvs.dir}/wsit/wsit"/>
+
+ <macrodef name="antbridge">
+ <attribute name="target" default="main"/>
+ <attribute name="file" default="build.xml"/>
+ <sequential>
+ <exec dir="${metro.dir}" executable="ant">
+ <arg value="@{target}"/>
+ <arg value="-f"/>
+ <arg value="@{file}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <target name="checkout" depends="init" description="Checkout/Update the local metro sources">
+
+ <mkdir dir="${cvs.dir}"/>
+
+ <echo>CVS out to: ${cvs.dir}</echo>
+
+ <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs"
+ package="wsit/wsit"
+ dest="${cvs.dir}"
+ tag="${cvs.tag}"
+ />
+
+ </target>
+
+ <target name="install.adapter" depends="init">
+ <copy todir="${metro.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/>
+ </target>
+
+ <target name="clean.metro">
+ <antbridge target="clean"/>
+ </target>
+
+ <target name="build.metro" depends="clean.metro, install.adapter">
+ <antbridge target="copy-binaries" file="metro-build-adapter.xml"/>
+ <echo>*********************************</echo>
+ <echo>The metro binaries have been copied to 'thirdparty-gen'</echo>
+ <echo>*********************************</echo>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/hbraun/ant-import/build-metro.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/branches/hbraun/ant-import/build-setup.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-setup.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant-import/build-setup.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -30,6 +30,12 @@
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+ <property name="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+
<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}"/>
@@ -40,13 +46,18 @@
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<condition property="jbossws.integration.jboss42" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Modified: stack/metro/branches/hbraun/ant-import/build-testsuite.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-testsuite.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant-import/build-testsuite.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -46,8 +46,8 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/>
- <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
</path>
Modified: stack/metro/branches/hbraun/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-thirdparty.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant-import/build-thirdparty.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -48,19 +48,20 @@
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/>
@@ -68,7 +69,7 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar" dest="${thirdparty.dir}/jsr173_api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr250-api.jar" dest="${thirdparty.dir}/jsr250-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
+ <!--get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/-->
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/>
@@ -76,7 +77,6 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
Modified: stack/metro/branches/hbraun/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/macros-deploy-sunri.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant-import/macros-deploy-sunri.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -53,7 +53,7 @@
</sequential>
</macrodef>
- <!-- Remove jbossws/sunri from jboss42 -->
+ <!-- Remove jbossws/sunri from jboss422 -->
<macrodef name="macro-undeploy-sunri422">
<sequential>
<delete>
@@ -78,6 +78,70 @@
</macrodef>
<!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss423.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss423 -->
+ <macrodef name="macro-undeploy-sunri423">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss423.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
Added: stack/metro/branches/hbraun/ant-import/metro-build-adapter.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/metro-build-adapter.xml (rev 0)
+++ stack/metro/branches/hbraun/ant-import/metro-build-adapter.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="JBossWS-BuildAdapter" default="copy-binaries" basedir=".">
+
+ <import file="properties.xml"/>
+ <import file="build.xml"/>
+
+ <property name="thirdparty.gen" value="../../../../thirdparty-gen"/>
+
+ <target name="adapter.init">
+ <!-- Directory for metro generated jars that are not distributed through 'repository.jboss.com' -->
+ <mkdir dir="${thirdparty.gen}"/>
+ </target>
+ <!--
+ Creates the core metro extension jar:
+ 'rt/build/wsit-rt.jar'
+ -->
+ <target name="-metro.runtime.jar" depends="WSIT.main">
+ <ant dir="." target="create-wsit-runtime-jar"/>
+ </target>
+
+ <target name="metro.jars" description="Creates the metro standalone jars" depends="init">
+ <antcall target="-metro.runtime.jar"/>
+ </target>
+
+ <target name="copy-binaries"
+ description="Builds the metro jars and copies them to thirdparty-gen"
+ depends="metro.jars">
+
+
+ <mkdir dir="${rt.dir}/build/jboss-tmp"/>
+ <unzip src="${rt.dir}/build/wsit-rt.jar" dest="${rt.dir}/build/jboss-tmp/"/>
+ <rename src="${rt.dir}/build/jboss-tmp/WEB-INF" dest="${rt.dir}/build/jboss-tmp/wsdl"/>
+ <zip destfile="${rt.dir}/build/jboss-wsit-rt.jar" basedir="${rt.dir}/build/jboss-tmp/"/>
+
+ <copy todir="${thirdparty.gen}" verbose="true">
+
+ <!-- Generated jars -->
+ <fileset dir="${rt.dir}/build/">
+ <include name="jboss-wsit-rt.jar"/>
+ </fileset>
+
+ <!-- Metro 3rd party thats not available through repo.jboss.com -->
+
+ <fileset dir="${lib.runtime.dir}">
+ <include name="jaxws-local-transport.jar"/>
+ <include name="mimepull.jar"/>
+ <include name="stax-utils.jar"/>
+ <include name="txnannprocessor.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="xmldsig.jar"/>
+ <include name="xws-security.jar"/>
+
+ <!-- a custom jarjar resolver package -->
+ <include name="resolver.jar"/>
+ </fileset>
+ </copy>
+
+
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/hbraun/ant-import/metro-build-adapter.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml (rev 0)
+++ stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- wsit-rm -->
+ <war warfile="${tests.output.dir}/libs/wsit-rm.war" webxml="${tests.output.dir}/resources/wsit/rm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/wsit/rm/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/wsit/rm/WEB-INF">
+ <include name="*/**"/>
+ </webinf>
+ </war>
+
+
+ </target>
+</project>
Property changes on: stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml (rev 0)
+++ stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <property name="tests.output.dir" value="${sunri.dir}/output/tests"/>
+
+ <import file="${sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
+
+ <!-- Define excluded tests -->
+ <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile" value="${sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ <property name="tests.dir" value="${sunri.dir}/src/test"/>
+ <property name="tests.java.dir" value="${tests.dir}/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+
+ <!--
+ Init the various classpaths
+ -->
+ <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
+ </path>
+
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Generating sources -->
+ <!-- ================================================================== -->
+
+ <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts">
+
+ <!-- placeholder for jaxws tools extensions -->
+ </target>
+
+ <!--
+ Generate JAX-WS sources
+ -->
+ <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts.">
+
+ <!-- placeholder for jaxws tools extension points -->
+
+ </target>
+
+ <target name="tests-compile-generated-resources" depends="wsgen">
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${sunri.dir}/src/test/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${sunri.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${sunri.dir}/src/test"/>
+ </target>
+
+ <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
+ <ant antfile="${sunri.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
+</project>
Property changes on: stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/branches/hbraun/ant.properties.example
===================================================================
--- stack/metro/branches/hbraun/ant.properties.example 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/ant.properties.example 2007-12-20 13:17:47 UTC (rev 5370)
@@ -3,14 +3,12 @@
#
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
# Optional JBoss Home
#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
-# The JBoss server under test. This can be [jboss422|jboss500]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
jbossws.integration.target=jboss422
# The JBoss settings
@@ -33,7 +31,7 @@
#force.thirdparty.get=true
# JDK settings
-#jdk6.home=/usr/java/jdk1.6
+#java.home.jdk16=/usr/java/jdk1.6
# Java Compiler options
javac.debug=yes
Modified: stack/metro/branches/hbraun/build.xml
===================================================================
--- stack/metro/branches/hbraun/build.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/build.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -12,279 +12,296 @@
<!-- $Id$ -->
<project default="main" basedir="." name="JBossWS-SunRI">
-
- <property name="int.sunri.dir" value="${basedir}"/>
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-deploy.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-testsuite.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="sunri.dir" value="${int.sunri.dir}"/>
- <property name="sunri.src.dir" value="${sunri.dir}/src/main"/>
- <property name="sunri.distro.dir" value="${sunri.src.dir}/distro"/>
- <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/>
- <property name="sunri.java.dir" value="${sunri.src.dir}/java"/>
- <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/>
- <property name="sunri.output.dir" value="${sunri.dir}/output"/>
- <property name="sunri.output.apidocs.dir" value="${sunri.output.dir}/apidocs"/>
- <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/>
- <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/>
- <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty">
- <mkdir dir="${sunri.output.apidocs.dir}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-sunri"/>
- <target name="compile-classes-sunri" depends="init">
- <mkdir dir="${sunri.output.classes.dir}"/>
- <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/wsf/stack/sunri/**"/>
- <classpath refid="sunri.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${sunri.output.etc.dir}"/>
- <copy todir="${sunri.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${sunri.etc.dir}">
- <include name="component-info.xml"/>
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-sunri-${version.id}"/>
- <filtersfile file="${int.sunri.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files.">
- </target>
-
- <target name="jars-common" depends="compile">
-
- <!-- Build jbossws-sunri.jar -->
- <mkdir dir="${sunri.output.lib.dir}"/>
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.classes.dir}">
- <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/>
- <include name="org/jboss/wsf/stack/sunri/injection/**"/>
- <include name="org/jboss/wsf/stack/sunri/client/**"/>
- <include name="org/jboss/wsf/stack/sunri/metadata/**"/>
- <include name="org/jboss/wsf/stack/sunri/log/**"/>
- <include name="org/jboss/wsf/stack/sunri/*"/>
- </fileset>
- <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/>
- </jar>
- <!-- jbossws-sunri-client.jar -->
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar" manifest="${sunri.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.classes.dir}">
- <include name="org/jboss/wsf/stack/sunri/client/**"/>
- <include name="org/jboss/wsf/stack/sunri/tools/**"/>
- </fileset>
- <metainf dir="${sunri.resources.dir}/jbossws-sunri-client.jar/META-INF"/>
- </jar>
+ <property name="int.sunri.dir" value="${basedir}"/>
- <!-- Build jbossws-context.war -->
- <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
- <fileset dir="${sunri.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${sunri.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws-sunri-src.zip -->
- <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" >
- <fileset dir="${sunri.java.dir}"/>
- </zip>
- </target>
-
- <target name="jars-jboss50" depends="jars-common" if="jboss500.home">
-
- <!-- Concat jbossws-beans.xml -->
- <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-sunri50.sar -->
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf">
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-bin-dist.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <fileset dir="${sunri.output.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.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="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"/>
- </fileset>
- <fileset dir="${sunri.output.lib.dir}">
- <include name="jbossws-sunri.jar"/>
- </fileset>
- <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
- </target>
-
- <target name="jars-jboss42" depends="jars-common" if="jboss422.home">
-
- <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
-
- <!-- Concat jboss-beans.xml -->
- <concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
- <fileset file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-sunri42.sar -->
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${sunri.output.lib.dir}">
- <include name="jbossws-sunri.jar"/>
- </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="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="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"/>
- </fileset>
- <fileset dir="${sunri.output.lib.dir}/jbossws-sunri42">
- <include name="jbossws.beans/**"/>
- </fileset>
- <metainf dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
+ <property name="sunri.dir" value="${int.sunri.dir}"/>
+ <property name="sunri.src.dir" value="${sunri.dir}/src/main"/>
+ <property name="sunri.distro.dir" value="${sunri.src.dir}/distro"/>
+ <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/>
+ <property name="sunri.java.dir" value="${sunri.src.dir}/java"/>
+ <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/>
+ <property name="sunri.output.dir" value="${sunri.dir}/output"/>
+ <property name="sunri.output.apidocs.dir" value="${sunri.output.dir}/apidocs"/>
+ <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/>
+ <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/>
+ <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/>
+
+
+ <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
+ <import file="${basedir}/ant-import/build-metro.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare,thirdparty">
+ <mkdir dir="${sunri.output.apidocs.dir}"/>
</target>
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
- <!-- expand the sunri sources -->
- <mkdir dir="${sunri.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/>
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
- <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <pathelement path="${sunri50.integration.classpath}"/>
- <pathelement path="${sunri.integration.classpath}"/>
- </classpath>
+ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
- <packageset dir="${sunri.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes">
- <include name="com/sun/**"/>
- </packageset>
+ <!-- Compile java sources -->
+ <target name="compile-classes" depends="compile-classes-sunri"/>
+ <target name="compile-classes-sunri" depends="init">
+ <mkdir dir="${sunri.output.classes.dir}"/>
+ <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/wsf/stack/sunri/**"/>
+ <classpath refid="sunri.integration.classpath"/>
+ </javac>
+ </target>
- <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
- <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
- <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
- <group title="Container integration" packages="org.jboss.wsf.container*"/>
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${sunri.output.etc.dir}"/>
+ <copy todir="${sunri.output.etc.dir}" filtering="yes" overwrite="true">
+ <fileset dir="${sunri.etc.dir}">
+ <include name="component-info.xml"/>
+ <include name="default.mf"/>
+ </fileset>
+ <filterset>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-sunri-${version.id}"/>
+ <filtersfile file="${int.sunri.dir}/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${sunri.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.sunri.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
-
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files.">
+ </target>
+
+ <target name="jars-common" depends="compile">
+
+ <!-- Build jbossws-sunri.jar -->
+ <mkdir dir="${sunri.output.lib.dir}"/>
+ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf">
+ <fileset dir="${sunri.output.classes.dir}">
+ <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/>
+ <include name="org/jboss/wsf/stack/sunri/injection/**"/>
+ <include name="org/jboss/wsf/stack/sunri/client/**"/>
+ <include name="org/jboss/wsf/stack/sunri/metadata/**"/>
+ <include name="org/jboss/wsf/stack/sunri/log/**"/>
+ <include name="org/jboss/wsf/stack/sunri/*"/>
+ </fileset>
+ <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/>
+ </jar>
+
+ <!-- jbossws-sunri-client.jar -->
+ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar" manifest="${sunri.output.etc.dir}/default.mf">
+ <fileset dir="${sunri.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/sunri/client/**"/>
+ <include name="org/jboss/wsf/stack/sunri/tools/**"/>
+ </fileset>
+ <metainf dir="${sunri.resources.dir}/jbossws-sunri-client.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
+ <fileset dir="${sunri.resources.dir}/jbossws-context.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ </fileset>
+ <webinf dir="${sunri.resources.dir}/jbossws-context.war/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- Build jbossws-sunri-src.zip -->
+ <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" >
+ <fileset dir="${sunri.java.dir}"/>
+ </zip>
+ </target>
+
+ <target name="jars-jboss50" depends="jars-common" if="jboss500.home">
+
+ <!-- Concat jbossws-beans.xml -->
+ <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0">
+ </header>
+ <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <!-- Build jbossws-sunri50.sar -->
+ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf">
+
+ <fileset dir="${sunri.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+
+ <fileset dir="${thirdparty.dir}">
+ <include name="FastInfoset.jar"/>
+ <include name="http.jar"/>
+ <include name="jaxrpc-api.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxws-rt.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="jsr173_api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="jsr250-api.jar"/>
+
+ </fileset>
+
+ <!-- Any extra metro jar, including metro-rt.jar -->
+ <fileset dir="thirdparty-gen">
+ <include name="*.jar"/>
+ </fileset>
+
+ <fileset dir="${sunri.output.lib.dir}">
+ <include name="jbossws-sunri.jar"/>
+ </fileset>
+ <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50">
+ <include name="jbossws-beans.xml"/>
+ </metainf>
+ </jar>
+ </target>
+
+ <target name="jars-jboss42" depends="jars-common" if="jboss422.home">
+
+ <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+
+ <!-- Concat jboss-beans.xml -->
+ <concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+ </header>
+ <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
+ <fileset file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <!-- Build jbossws-sunri42.sar -->
+ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf">
+ <fileset dir="${sunri.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${sunri.output.lib.dir}">
+ <include name="jbossws-sunri.jar"/>
+ </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="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="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ </fileset>
+
+ <!-- Any extra metro jar, including metro-rt.jar -->
+ <fileset dir="thirdparty-gen">
+ <include name="*.jar"/>
+ </fileset>
+
+
+ <fileset dir="${sunri.output.lib.dir}/jbossws-sunri42">
+ <include name="jbossws.beans/**"/>
+ </fileset>
+ <metainf dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+ </target>
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
+
+ <!-- expand the sunri sources -->
+ <mkdir dir="${sunri.output.dir}/thirdparty-sources"/>
+ <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/>
+
+ <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath>
+ <pathelement path="${sunri50.integration.classpath}"/>
+ <pathelement path="${sunri.integration.classpath}"/>
+ </classpath>
+
+ <packageset dir="${sunri.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/wsf/**"/>
+ </packageset>
+ <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes">
+ <include name="com/sun/**"/>
+ </packageset>
+
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
+ <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
+ <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
+ <group title="Container integration" packages="org.jboss.wsf.container*"/>
+
+ </javadoc>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${sunri.output.dir}"/>
+ <delete dir="thirdparty.gen"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ <delete dir="${int.sunri.dir}/thirdparty"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
+
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
+
</project>
Modified: stack/metro/branches/hbraun/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/branches/hbraun/src/main/distro/ant.properties.example 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/main/distro/ant.properties.example 2007-12-20 13:17:47 UTC (rev 5370)
@@ -6,8 +6,9 @@
# Optional JBoss Home
jboss500.home=(a)jboss500.home@
jboss422.home=(a)jboss422.home@
+jboss423.home=(a)jboss423.home@
-# The JBoss server under test. This can be [jboss500|jboss422]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
jbossws.integration.target=jboss422
# The JBoss settings
Modified: stack/metro/branches/hbraun/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/branches/hbraun/src/main/distro/bin-dist-build.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/main/distro/bin-dist-build.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -12,87 +12,97 @@
<!-- $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="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.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"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
+
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
+
+ <condition property="jbossws.integration.jboss42" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </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>
+ <condition property="jboss.home" value="${jboss423.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </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 +122,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
Modified: stack/metro/branches/hbraun/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/branches/hbraun/src/main/distro/bin-dist-deploy.xml 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/main/distro/bin-dist-deploy.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -12,54 +12,60 @@
<!-- $Id: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ -->
<project>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/sunri to jboss50">
- <macro-deploy-sunri500
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
- <macro-deploy-framework
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss500.home}"/>
- </target>
- <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed
- jbosshome="${jboss500.home}"
- thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss50 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri500/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
- </target>
-
- <!-- Deploy jbossws/sunri to jboss42 -->
- <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri422
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
- <macro-deploy-framework
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss422.home}"/>
- </target>
- <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed
- jbosshome="${jboss422.home}"
- thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss42 -->
- <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri422/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
- </target>
- <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
- </target>
-
-</project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss500 -->
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/sunri to jboss500">
+ <macro-deploy-sunri500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/>
+ </target>
+ <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500">
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/sunri to jboss422 -->
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/sunri to jboss422">
+ <macro-deploy-sunri422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/>
+ </target>
+ <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss422 -->
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/sunri from jboss422">
+ <macro-undeploy-sunri422/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ </target>
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/sunri to jboss423 -->
+ <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/sunri to jboss423">
+ <macro-deploy-sunri423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/>
+ </target>
+ <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss423 -->
+ <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/sunri from jboss423">
+ <macro-undeploy-sunri423/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
+ </target>
+ <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
+ </target>
+
+</project>
\ No newline at end of file
Modified: stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -76,16 +76,16 @@
/**
* A copy of DeploymentDescriptorParser
- *
*
+ *
* @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener
- *
+ *
* @author WS Development Team
* @author Kohsuke Kawaguchi
* @author Thomas.Diesler(a)jboss.org
* @since 10-May-2007
*/
-public class DeploymentDescriptorParserExt<A>
+public class DeploymentDescriptorParserExt<A>
{
private final Container container;
private final ClassLoader classLoader;
@@ -127,10 +127,21 @@
String resourcePath = "/META-INF/";
try
{
- loader.getResource(resourcePath);
+ URL resource = loader.getResource(resourcePath);
+ InputStream inputStream = null;
+ try
+ {
+ inputStream = resource.openStream();
+ }
+ finally
+ {
+ if(inputStream!=null)
+ inputStream.close();
+ }
+
log.warn("bypass collectDocs(), it doesnt work for EJB endpoints");
}
- catch (MalformedURLException e)
+ catch (Exception e)
{
resourcePath = "/WEB-INF/";
log.debug("Collecting docs from " + resourcePath);
@@ -278,7 +289,7 @@
ensureNoContent(reader);
Invoker invoker = createInvoker(implementorClass);
WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
- serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false);
+ serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false);
adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
}
else
Added: stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java
===================================================================
--- stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java (rev 0)
+++ stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,164 @@
+package org.jboss.wsf.stack.sunri;
+
+import com.sun.xml.ws.transport.http.ResourceLoader;
+
+import javax.servlet.ServletContext;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.util.Set;
+import java.util.Enumeration;
+import java.io.InputStream;
+import java.io.IOException;
+
+public class FakeServletContext implements ServletContext
+{
+ private ResourceLoader resourceLoader;
+
+
+ public FakeServletContext(ResourceLoader resourceLoader)
+ {
+ this.resourceLoader = resourceLoader;
+ }
+
+
+ public ServletContext getContext(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public String getContextPath()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public int getMajorVersion()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public int getMinorVersion()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public String getMimeType(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Set getResourcePaths(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public URL getResource(String name)
+ {
+ try
+ {
+ return resourceLoader.getResource(name);
+
+ } catch (Throwable e)
+ {
+ return null;
+ }
+ }
+
+ public InputStream getResourceAsStream(String string)
+ {
+ try
+ {
+ return getResource(string).openStream();
+ } catch (Throwable e)
+ {
+ return null;
+ }
+ }
+
+ public RequestDispatcher getRequestDispatcher(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public RequestDispatcher getNamedDispatcher(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Servlet getServlet(String string) throws ServletException
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Enumeration getServlets()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Enumeration getServletNames()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public void log(String string)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void log(Exception exception, String string)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void log(String string, Throwable throwable)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getRealPath(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public String getServerInfo()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public String getInitParameter(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Object getAttribute(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public void setAttribute(String string, Object object)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public void removeAttribute(String string)
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+
+ public String getServletContextName()
+ {
+ throw new IllegalArgumentException("Not implemented");
+ }
+}
Property changes on: stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
===================================================================
--- stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -83,7 +83,7 @@
if (target != null)
{
String query = req.getQueryString();
- if (target.isMetadataQuery(query)) {
+ if (isMetadataQuery(query)) {
// Sends published WSDL and schema documents
target.publishWSDL(context, req, res);
return;
@@ -139,4 +139,20 @@
{
throw new IllegalArgumentException("JBWS-1869: Not implemented");
}
+
+ /**
+ * Returns true if the given query string is for metadata request.
+ *
+ * @param query
+ * String like "xsd=1" or "perhaps=some&unrelated=query".
+ * Can be null.
+ * @return true for metadata requests
+ * false for web service requests
+ */
+ private boolean isMetadataQuery(String query) {
+ // we intentionally return true even if documents don't exist,
+ // so that they get 404.
+ return query != null && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
+ }
+
}
Modified: stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -38,9 +38,11 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.stack.sunri.DeploymentDescriptorParserExt;
+import org.jboss.wsf.stack.sunri.FakeServletContext;
import org.jboss.wsf.stack.sunri.log.MessageLogPipelineHook;
import javax.xml.ws.WebServiceException;
+import javax.servlet.ServletContext;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -78,7 +80,6 @@
throw new IllegalArgumentException("Null runtimeLoader");
ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
- JBossWSContainer container = new JBossWSContainer();
try
{
@@ -87,8 +88,9 @@
ResourceLoaderAdapter resourceLoaderAdapter = new ResourceLoaderAdapter(runtimeLoader);
ResourceLoader resourceLoader = new VFSResourceLoader(resourceLoaderAdapter);
+ JBossWSContainer container = new JBossWSContainer(resourceLoader);
- // TODO: refactor to general HTTPAdapter usage
+ // TODO: refactor to general HTTPAdapter usage
ServletAdapterList adapterList = new ServletAdapterList();
// Parse the descriptor file and build endpoint infos
@@ -158,11 +160,13 @@
/**
- * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}. Pipes
- * can get ServletContext from Container and use it to load some resources.
+ * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}.
+ * Pipes can get ServletContext from Container and use it to load some resources.
*/
static class JBossWSContainer extends Container
{
+ private ResourceLoader resourceLoader;
+
private final Module module = new Module()
{
private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
@@ -174,8 +178,9 @@
}
};
- JBossWSContainer()
+ JBossWSContainer(ResourceLoader loader)
{
+ this.resourceLoader = loader;
}
public <T> T getSPI(Class<T> spiType)
@@ -192,6 +197,10 @@
{
return (T)new MessageLogPipelineHook();
}
+ else if(spiType == ServletContext.class)
+ {
+ return (T)new FakeServletContext(resourceLoader);
+ }
log.warn("Unable to resolve SPI for type: " + spiType);
return null;
Added: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java
===================================================================
--- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java (rev 0)
+++ stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jboss.test.ws.wsit.rm;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+/**
+ *
+ * @author User
+ */
+@WebService(targetNamespace = "http://calculator.me.org/")
+public class CalculatorWS {
+
+ /**
+ * Web service operation
+ */
+ @WebMethod(operationName = "add")
+ public int add(@WebParam(name = "i") int i, @WebParam(name = "j") int j) {
+ return i + j;
+ }
+
+}
Property changes on: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWS.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java
===================================================================
--- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java (rev 0)
+++ stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,59 @@
+
+package org.jboss.test.ws.wsit.rm.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "add", namespace = "http://rm.me.org/")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "add", namespace = "http://rm.me.org/", propOrder = {
+ "i",
+ "j"
+})
+public class Add {
+
+ @XmlElement(name = "i", namespace = "")
+ private int i;
+ @XmlElement(name = "j", namespace = "")
+ private int j;
+
+ /**
+ *
+ * @return
+ * returns int
+ */
+ public int getI() {
+ return this.i;
+ }
+
+ /**
+ *
+ * @param i
+ * the value for the i property
+ */
+ public void setI(int i) {
+ this.i = i;
+ }
+
+ /**
+ *
+ * @return
+ * returns int
+ */
+ public int getJ() {
+ return this.j;
+ }
+
+ /**
+ *
+ * @param j
+ * the value for the j property
+ */
+ public void setJ(int j) {
+ this.j = j;
+ }
+
+}
Property changes on: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java
===================================================================
--- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java (rev 0)
+++ stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.wsit.rm.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "addResponse", namespace = "http://rm.me.org/")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "addResponse", namespace = "http://rm.me.org/")
+public class AddResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private int _return;
+
+ /**
+ *
+ * @return
+ * returns int
+ */
+ public int getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(int _return) {
+ this._return = _return;
+ }
+
+}
Property changes on: stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss423.txt (from rev 5357, stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt)
===================================================================
--- stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss423.txt (rev 0)
+++ stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss423.txt 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1673] Fix JAXR samples for SunRI
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1674] Fix @WebServiceRef with SunRI
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss500.txt 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/src/test/resources/test-excludes-jboss500.txt 2007-12-20 13:17:47 UTC (rev 5370)
@@ -16,3 +16,9 @@
# [JBWS-1674] Fix @WebServiceRef with SunRI
org/jboss/test/ws/jaxws/samples/retail/**
+
+# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Added: stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml
===================================================================
--- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml (rev 0)
+++ stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
+
+<sun-web-app error-url="">
+ <context-root>/CalculatorApp</context-root>
+ <class-loader delegate="true"/>
+ <jsp-config>
+ <property name="keepgenerated" value="true">
+ <description>Keep a copy of the generated servlet class' java code.</description>
+ </property>
+ </jsp-config>
+</sun-web-app>
Property changes on: stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml (rev 0)
+++ stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>org.jboss.test.ws.wsit.rm.CalculatorWS</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Property changes on: stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWS.xml
===================================================================
--- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWS.xml (rev 0)
+++ stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWS.xml 2007-12-20 13:17:47 UTC (rev 5370)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="CalculatorWSService" targetNamespace="http://calculator.me.org/" xmlns:tns="http://calculator.me.org/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+>
+ <message name="add"/>
+ <message name="addResponse"/>
+ <portType name="CalculatorWS">
+ <operation name="add">
+ <input message="tns:add"/>
+ <output message="tns:addResponse"/>
+ </operation>
+ </portType>
+ <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS">
+ <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"/>
+ <operation name="add">
+ <input/>
+ <output/>
+ </operation>
+ </binding>
+ <service name="CalculatorWSService">
+ <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"/>
+ </service>
+ <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
+ <wsrm:RMAssertion/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Property changes on: stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWS.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/branches/hbraun/version.properties
===================================================================
--- stack/metro/branches/hbraun/version.properties 2007-12-20 12:57:48 UTC (rev 5369)
+++ stack/metro/branches/hbraun/version.properties 2007-12-20 13:17:47 UTC (rev 5370)
@@ -6,7 +6,7 @@
specification.version=jbossws-2.0
version.id=2.1.0.DEV
-repository.id=2.1.0.DEV
+repository.id=snapshot
implementation.title=JBoss Web Services - Sun Metro
implementation.url=http://www.jboss.org/products/jbossws
@@ -14,21 +14,25 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
+jbossws-spi=snapshot
+jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-common=snapshot
-jbossws-spi=1.0.0.GA
-jbossws-jboss42=2.0.1.GA
+jbossws-jboss42=4.2.1.GA
junit=3.8.1
jboss-common-core=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0-SNAPSHOT
+jboss-javaee=5.0.0.Beta3
jboss-jaxr=1.2.0.GA
jboss-security-spi=2.0.0.Beta
sun-jaf=1.1
sun-jaxb=2.1.4
sun-jaxrpc=1.1
-sun-jaxws=2.1.1
+sun-jaxws=2.1.2
sun-servlet=2.5
ibm-wsdl4j=1.6.2
woodstox=3.1.1
+
+xml-commons=1.2
+xml-sec=1.3
+sun-javamail=1.4
16 years, 4 months
- 1
- 0
JBossWS SVN: r5369 - in stack/metro/trunk/src/main: resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 07:57:48 -0500 (Thu, 20 Dec 2007)
New Revision: 5369
Removed:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java
Modified:
stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
Log:
Remove logging stuff that is not stack specific
Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-12-20 11:27:01 UTC (rev 5368)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-12-20 12:57:48 UTC (rev 5369)
@@ -1,146 +0,0 @@
-/*
- * 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.stack.sunri.log;
-
-import java.util.Map;
-import java.util.logging.ErrorManager;
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
-import java.util.logging.SimpleFormatter;
-
-import org.jboss.logging.Logger;
-
-/**
- * A Handler (java.util.logging.Handler) class redirecting messages
- * to the jboss logging system.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @since 14-Jun-2007
- *
- */
-public class JBossLogHandler extends Handler
-{
- private Map<String, String> levelMap;
- private String defaultLevel;
-
- public JBossLogHandler(Map<String, String> levelMap, String defaultLevel)
- {
- super.setFormatter(new SimpleFormatter());
- this.levelMap = levelMap;
- this.defaultLevel = defaultLevel;
- }
-
- @Override
- public void publish(LogRecord record)
- {
- if (!isLoggable(record))
- {
- return;
- }
- String msg;
- try
- {
- msg = getFormatter().formatMessage(record);
- }
- catch (Exception ex)
- {
- // We don't want to throw an exception here, but we
- // report the exception to any registered ErrorManager.
- reportError(null, ex, ErrorManager.FORMAT_FAILURE);
- return;
- }
-
- String level = levelMap.get(record.getLevel().getName());
- level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()) : level;
- level = level == null ? defaultLevel : level;
- if ("info".equalsIgnoreCase(level))
- {
- if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled())
- {
- Logger.getLogger(record.getSourceClassName()).info(msg);
- }
- else
- {
- Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg);
- }
-
- }
- else if ("error".equalsIgnoreCase(level))
- {
- Logger.getLogger(record.getSourceClassName()).error(msg);
- }
- else if ("warn".equalsIgnoreCase(level))
- {
- Logger.getLogger(record.getSourceClassName()).warn(msg);
- }
- else if ("debug".equalsIgnoreCase(level))
- {
- if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled())
- {
- Logger.getLogger(record.getSourceClassName()).debug(msg);
- }
- else
- {
- Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg);
- }
- }
- else if ("trace".equalsIgnoreCase(level))
- {
- if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled())
- {
- Logger.getLogger(record.getSourceClassName()).trace(msg);
- }
- else
- {
- Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg);
- }
- }
- else
- {
- Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg);
- }
- }
-
- @Override
- public boolean isLoggable(LogRecord record)
- {
- if (record == null)
- {
- return false;
- }
- return super.isLoggable(record);
- }
-
- @Override
- public void flush()
- {
- //nothing to do
- }
-
- @Override
- public void close() throws SecurityException
- {
- //nothing to do
- }
-
-}
\ No newline at end of file
Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-12-20 11:27:01 UTC (rev 5368)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-12-20 12:57:48 UTC (rev 5369)
@@ -1,148 +0,0 @@
-/*
- * 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.stack.sunri.log;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Filter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-
-import org.jboss.logging.Logger;
-
-/**
- * Redirects JDK Logger output to the JBoss Logger.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @since 14-Jun-2007
- *
- */
-public class JDKLogRedirector
-{
- private List<String> namespaces = new LinkedList<String>();
- private Map<String, String> levelMapping = new HashMap<String, String>();
- private String defaultLevel;
- private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class);
-
- public JDKLogRedirector()
- {
- }
-
- public void changeHandlers()
- {
-
- for (String ns : namespaces)
- {
- changeHandler(ns);
- }
- }
-
- /**
- * Modifies the jdk root logger in order not to log records coming from
- * loggers with the provided namespace; these records are then logged
- * through the JBoss Logger.
- *
- * @param ns
- */
- public void changeHandler(String ns)
- {
- if (ns == null)
- ns = "";
- myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns);
- java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger("");
- Handler[] handlers = jdkRootLogger.getHandlers();
- for (int i = 0; i < handlers.length; i++)
- {
- Handler handler = handlers[i];
- if (!(handler instanceof JBossLogHandler))
- {
- StringBuffer sb = new StringBuffer("Disableing handler ");
- sb.append(handler).append(" with level ").append(handler.getLevel());
- myLogger.debug(sb);
- Filter f = handler.getFilter();
- if (f != null && f instanceof NamespaceFilter)
- {
- ((NamespaceFilter)f).addNamespace(ns);
- }
- else
- {
- NamespaceFilter nsFilter = new NamespaceFilter(false);
- nsFilter.addNamespace(ns);
- handler.setFilter(nsFilter);
- }
- }
- }
- myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns);
- Handler jbossLogHandler = new JBossLogHandler(levelMapping, defaultLevel);
- jbossLogHandler.setLevel(Level.ALL);
- java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler);
- }
-
- public void addNamespace(String ns)
- {
- namespaces.add(ns);
- }
-
- public List<String> getNamespaces()
- {
- return namespaces;
- }
-
- public void setNamespaces(List<String> namespaces)
- {
- this.namespaces = namespaces;
- }
-
- public String getDefaultLevel()
- {
- return defaultLevel;
- }
-
- public void setDefaultLevel(String defaultLevel)
- {
- this.defaultLevel = defaultLevel;
-
- }
-
- public Map<String, String> getLevelMapping()
- {
- return levelMapping;
- }
-
- public void setLevelMapping(Map<String, String> levelMapping)
- {
- this.levelMapping = levelMapping;
- }
-
- public String putLevelMappingEntry(String key, String value)
- {
- return levelMapping.put(key, value);
- }
-
- public void start()
- {
- changeHandlers();
- }
-}
Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-12-20 11:27:01 UTC (rev 5368)
+++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-12-20 12:57:48 UTC (rev 5369)
@@ -30,7 +30,7 @@
</bean>
<!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector">
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.log.JDKLogRedirector">
<property name="namespaces">
<list class="java.util.LinkedList" elementClass="java.lang.String">
<value>javax.enterprise.resource.webservices.jaxws</value>
16 years, 4 months
- 1
- 0
JBossWS SVN: r5368 - stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 06:27:01 -0500 (Thu, 20 Dec 2007)
New Revision: 5368
Modified:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java
Log:
Add [CXF-1320] fixme
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-20 11:24:43 UTC (rev 5367)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-20 11:27:01 UTC (rev 5368)
@@ -71,6 +71,8 @@
Service service = Service.create(wsdlURL, serviceName);
RMEndpoint port = (RMEndpoint)service.getPort(RMEndpoint.class);
+ System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only");
+
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
}
16 years, 4 months
- 1
- 0
JBossWS SVN: r5367 - in stack/cxf/trunk: ant-import and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 06:24:43 -0500 (Thu, 20 Dec 2007)
New Revision: 5367
Added:
stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml
Modified:
stack/cxf/trunk/.classpath
stack/cxf/trunk/ant-import/build-testsuite.xml
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/src/test/etc/log4j.xml
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java
stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
Log:
More work on CXF WS-RM integration
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/.classpath 2007-12-20 11:24:43 UTC (rev 5367)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="org/jboss/test/ws/jaxws/smoke/tools/" kind="src" path="src/test-framework/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
@@ -15,7 +14,6 @@
<classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-framework.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
<classpathentry kind="lib" path="thirdparty/jdom-1.0.jar"/>
@@ -37,5 +35,6 @@
<classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/>
<classpathentry kind="lib" path="tools/ant/lib/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/cxf/trunk/ant-import/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-20 11:24:43 UTC (rev 5367)
@@ -35,6 +35,9 @@
<pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/>
<pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/>
<pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/>
<pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/>
<pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/>
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-20 11:24:43 UTC (rev 5367)
@@ -37,6 +37,7 @@
<isfalse value="${checksum.ok}"/>
</or>
</condition>
+ <echo message="force.thirdparty.get=${force.thirdparty.get}"/>
</target>
<!--
Modified: stack/cxf/trunk/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-20 11:24:43 UTC (rev 5367)
@@ -61,7 +61,7 @@
</category>
<category name="org.apache.cxf">
- <priority value="DEBUG"/>
+ <priority value="TRACE"/>
</category>
<!-- Apache security is verbose -->
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-20 11:24:43 UTC (rev 5367)
@@ -25,10 +25,14 @@
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -49,18 +53,17 @@
{
return new JBossWSTestSetup(BasicRMTestCase.class, "jaxws-cxf-reliable.war");
}
-
- public void testWSDLAccess() throws Exception
+
+ public void _testWSDLAccess() throws Exception
{
URL wsdlURL = new URL(endpointURL + "?wsdl");
Element wsdl = DOMUtils.parse(wsdlURL.openStream());
assertNotNull(wsdl);
-
+
System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies");
}
-
- public void testBasicRMAccess() throws Exception
+ public void _testStandardAPIClient() throws Exception
{
URL wsdlURL = new File("resources/jaxws/cxf/reliable/reliable.wsdl").toURL();
QName serviceName = new QName(targetNS, "RMService");
@@ -71,4 +74,25 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
}
+
+ public void testSpringClient() throws Exception
+ {
+ SpringBusFactory bf = new SpringBusFactory();
+ URL cxfConfig = new File("resources/jaxws/cxf/reliable/cxf-client.xml").toURL();
+ Bus bus = bf.createBus(cxfConfig);
+ BusFactory.setDefaultBus(bus);
+
+ URL wsdlURL = new File("resources/jaxws/cxf/reliable/reliable.wsdl").toURL();
+ QName serviceName = new QName(targetNS, "RMService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ RMEndpoint port = (RMEndpoint)service.getPort(RMEndpoint.class);
+
+ // Enable addressing
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
+
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
}
\ No newline at end of file
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-20 11:24:43 UTC (rev 5367)
@@ -21,14 +21,24 @@
*/
package org.jboss.test.ws.jaxws.cxf.reliable;
-// $Id$
-
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable", serviceName = "RMService")
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1-b03-
+ * Generated source version: 2.0
+ *
+ */
+@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface RMEndpoint
{
- String echo(String input);
+ @WebMethod
+ @WebResult(partName = "return")
+ public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0);
+
}
Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml 2007-12-20 11:24:43 UTC (rev 5367)
@@ -0,0 +1,51 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
+ <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
+ <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
+
+ <!--p:engine enabled="true" ignoreUnknownAssertions="true"/-->
+
+ <cxf:bus name="cxf">
+ <!--cxf:features>
+ <p:policies ignoreUnknownAssertions="true"/>
+ </cxf:features-->
+ <cxf:inInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalIn"/>
+ <ref bean="rmCodec"/>
+ </cxf:inInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalIn"/>
+ <ref bean="rmCodec"/>
+ </cxf:inFaultInterceptors>
+ <cxf:outInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalOut"/>
+ <ref bean="rmCodec"/>
+ </cxf:outInterceptors>
+ <cxf:outFaultInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalOut"/>
+ <ref bean="rmCodec"/>
+ </cxf:outFaultInterceptors>
+ </cxf:bus>
+
+</beans>
\ No newline at end of file
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-20 11:24:43 UTC (rev 5367)
@@ -2,15 +2,6 @@
# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $
#
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-20 11:24:43 UTC (rev 5367)
@@ -2,15 +2,6 @@
# $Id$
#
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-20 09:50:42 UTC (rev 5366)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-20 11:24:43 UTC (rev 5367)
@@ -2,15 +2,6 @@
# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $
#
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
16 years, 4 months
- 1
- 0