JBossWS SVN: r1691 - branches/tdiesler/trunk/integration-tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 08:48:05 -0500 (Thu, 21 Dec 2006)
New Revision: 1691
Added:
branches/tdiesler/trunk/integration-tomcat/.classpath
branches/tdiesler/trunk/integration-tomcat/.project
Log:
partial commit
Added: branches/tdiesler/trunk/integration-tomcat/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-tomcat/.classpath 2006-12-21 13:47:44 UTC (rev 1690)
+++ branches/tdiesler/trunk/integration-tomcat/.classpath 2006-12-21 13:48:05 UTC (rev 1691)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/>
+ <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/hibernate3.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/log4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/resolver.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/serializer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Added: branches/tdiesler/trunk/integration-tomcat/.project
===================================================================
--- branches/tdiesler/trunk/integration-tomcat/.project 2006-12-21 13:47:44 UTC (rev 1690)
+++ branches/tdiesler/trunk/integration-tomcat/.project 2006-12-21 13:48:05 UTC (rev 1691)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>integration-tomcat</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
19 years, 4 months
- 1
- 0
JBossWS SVN: r1690 - branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 08:47:44 -0500 (Thu, 21 Dec 2006)
New Revision: 1690
Added:
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java
Log:
partial commit
Added: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java 2006-12-21 13:46:51 UTC (rev 1689)
+++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java 2006-12-21 13:47:44 UTC (rev 1690)
@@ -0,0 +1,57 @@
+/*
+ * 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.ws.integration.jboss50;
+
+// $Id$
+
+import java.security.Principal;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.ws.extensions.security.SecurityAdaptor;
+import org.jboss.ws.extensions.security.SecurityAdaptorFactory;
+
+/**
+ * A Jboss specific SecurityAdaptorFactory
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class SecurityAdaptorFactoryImpl extends SecurityAdaptorFactory
+{
+ public SecurityAdaptor getSecurityAdaptor()
+ {
+ return new SecurityAdaptorImpl();
+ }
+
+ public class SecurityAdaptorImpl implements SecurityAdaptor
+ {
+ public void setPrincipal(Principal pricipal)
+ {
+ SecurityAssociation.setPrincipal(pricipal);
+ }
+
+ public void setCredential(Object credential)
+ {
+ SecurityAssociation.setCredential(credential);
+ }
+ }
+}
Property changes on: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/SecurityAdaptorFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
19 years, 4 months
- 1
- 0
JBossWS SVN: r1689 - in branches/tdiesler/trunk/integration-jboss42: . src/main/java/org/jboss/ws/integration/jboss42
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 08:46:51 -0500 (Thu, 21 Dec 2006)
New Revision: 1689
Added:
branches/tdiesler/trunk/integration-jboss42/.classpath
branches/tdiesler/trunk/integration-jboss42/.project
Removed:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java
Log:
partial commit
Added: branches/tdiesler/trunk/integration-jboss42/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/.classpath 2006-12-21 13:46:46 UTC (rev 1688)
+++ branches/tdiesler/trunk/integration-jboss42/.classpath 2006-12-21 13:46:51 UTC (rev 1689)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/>
+ <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/hibernate3.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/log4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/resolver.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/serializer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Added: branches/tdiesler/trunk/integration-jboss42/.project
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/.project 2006-12-21 13:46:46 UTC (rev 1688)
+++ branches/tdiesler/trunk/integration-jboss42/.project 2006-12-21 13:46:51 UTC (rev 1689)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>integration-jboss42</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 13:46:46 UTC (rev 1688)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 13:46:51 UTC (rev 1689)
@@ -24,8 +24,6 @@
// $Id$
import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
import javax.management.MBeanServer;
@@ -37,10 +35,6 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.ws.core.server.ServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
/**
* Publish the HTTP service endpoint to Tomcat
@@ -75,25 +69,6 @@
return "OK";
}
- public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi)
- {
- Set<String> links = new HashSet<String>();
-
- UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
-
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
- {
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
- links.add(sepMetaData.getLinkName());
-
- }
- }
-
- return links;
- }
-
private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
{
MBeanServer server = MBeanServerLocator.locateJBoss();
Deleted: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java 2006-12-21 13:46:46 UTC (rev 1688)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java 2006-12-21 13:46:51 UTC (rev 1689)
@@ -1,99 +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.ws.integration.jboss42;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.MBeanServer;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-
-/**
- * Publish the HTTP service endpoint to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class JBossServiceEndpointPublisher extends ServiceEndpointPublisher
-{
-
- public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- URL warURL = udi.localUrl;
- DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
- if (di == null)
- throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
-
- rewriteWebXml(udi);
-
- // Preserve the repository config
- DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
- auxdi.repositoryConfig = di.getTopRepositoryConfig();
- getMainDeployer().deploy(auxdi);
- return "OK";
- }
-
- public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- getMainDeployer().undeploy(udi.localUrl);
- return "OK";
- }
-
- public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi)
- {
- Set<String> links = new HashSet<String>();
-
- UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
-
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
- {
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
- links.add(sepMetaData.getLinkName());
-
- }
- }
-
- return links;
- }
-
- private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
- return mainDeployer;
- }
-}
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java 2006-12-21 13:46:46 UTC (rev 1688)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java 2006-12-21 13:46:51 UTC (rev 1689)
@@ -27,12 +27,10 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
-import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
@@ -51,10 +49,8 @@
UnifiedWebMetaData umd = new UnifiedWebMetaData();
umd.setContextRoot(wmd.getContextRoot());
umd.setServletMappings(wmd.getServletMappings());
- umd.setServletClassMap(wmd.getServletClassMap());
umd.setConfigName(wmd.getConfigName());
umd.setConfigFile(wmd.getConfigFile());
- umd.setContextLoader(wmd.getContextLoader());
umd.setSecurityDomain(wmd.getSecurityDomain());
umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
19 years, 4 months
- 1
- 0
JBossWS SVN: r1688 - branches/tdiesler/trunk/integration-jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 08:46:46 -0500 (Thu, 21 Dec 2006)
New Revision: 1688
Added:
branches/tdiesler/trunk/integration-jboss50/.classpath
branches/tdiesler/trunk/integration-jboss50/.project
Log:
partial commit
Added: branches/tdiesler/trunk/integration-jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/.classpath 2006-12-21 13:46:32 UTC (rev 1687)
+++ branches/tdiesler/trunk/integration-jboss50/.classpath 2006-12-21 13:46:46 UTC (rev 1688)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="org/jboss/ws/integration/jboss50/ServiceRefHandler.java" kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/>
+ <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/hibernate3.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/log4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/resolver.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/serializer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Added: branches/tdiesler/trunk/integration-jboss50/.project
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/.project 2006-12-21 13:46:32 UTC (rev 1687)
+++ branches/tdiesler/trunk/integration-jboss50/.project 2006-12-21 13:46:46 UTC (rev 1688)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>integration-jboss50</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
19 years, 4 months
- 1
- 0
JBossWS SVN: r1687 - in branches/tdiesler/trunk/build: . import
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 08:46:32 -0500 (Thu, 21 Dec 2006)
New Revision: 1687
Added:
branches/tdiesler/trunk/build/.classpath
branches/tdiesler/trunk/build/.project
Modified:
branches/tdiesler/trunk/build/
branches/tdiesler/trunk/build/ant.properties.example
branches/tdiesler/trunk/build/build.xml
branches/tdiesler/trunk/build/import/build-thirdparty.xml
Log:
partial commit
Property changes on: branches/tdiesler/trunk/build
___________________________________________________________________
Name: svn:ignore
+
output
thirdparty
ant.properties
version.properties.md5
Added: branches/tdiesler/trunk/build/.classpath
===================================================================
--- branches/tdiesler/trunk/build/.classpath 2006-12-21 13:31:07 UTC (rev 1686)
+++ branches/tdiesler/trunk/build/.classpath 2006-12-21 13:46:32 UTC (rev 1687)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: branches/tdiesler/trunk/build/.project
===================================================================
--- branches/tdiesler/trunk/build/.project 2006-12-21 13:31:07 UTC (rev 1686)
+++ branches/tdiesler/trunk/build/.project 2006-12-21 13:46:32 UTC (rev 1687)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>build</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: branches/tdiesler/trunk/build/ant.properties.example
===================================================================
--- branches/tdiesler/trunk/build/ant.properties.example 2006-12-21 13:31:07 UTC (rev 1686)
+++ branches/tdiesler/trunk/build/ant.properties.example 2006-12-21 13:46:32 UTC (rev 1687)
@@ -4,7 +4,7 @@
# Required JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1
+#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
# The JBoss server instance
jboss.server.instance=default
Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml 2006-12-21 13:31:07 UTC (rev 1686)
+++ branches/tdiesler/trunk/build/build.xml 2006-12-21 13:46:32 UTC (rev 1687)
@@ -13,9 +13,9 @@
<project default="main" name="JBossWS">
- <import file="${basedir}/src/ant/build-thirdparty.xml"/>
- <import file="${basedir}/src/ant/build-samples.xml"/>
- <import file="${basedir}/src/ant/build-release.xml"/>
+ <import file="${basedir}/import/build-thirdparty.xml"/>
+ <import file="${basedir}/import/build-samples.xml"/>
+ <import file="${basedir}/import/build-release.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -36,7 +36,7 @@
<property name="build.src.dist" value="${build.dir}/src-dist"/>
<property name="build.api" value="${build.dir}/api"/>
<property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
- <property name="src.dir" value="${basedir}/src/main"/>
+ <property name="src.dir" value="${basedir}/../jbossws/src/main"/>
<property name="src.etc.dir" value="${src.dir}/etc"/>
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.resources.dir" value="${src.dir}/resources"/>
@@ -46,6 +46,10 @@
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
<property name="test.resources.dir" value="${test.dir}/resources"/>
+
+ <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/>
+ <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/>
+ <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/>
<property name="thirdparty.dir" value="${basedir}/thirdparty"/>
@@ -162,7 +166,7 @@
<target name="compile-integration" depends="compile-jboss50-integration,compile-jboss42-integration,compile-tomcat-integration"/>
<target name="compile-jboss50-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${integration.jboss50.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/jboss50/**"/>
<classpath path="${build.classes14.dir}"/>
@@ -172,7 +176,7 @@
</target>
<target name="compile-jboss42-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${integration.jboss42.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/jboss42/**"/>
<classpath path="${build.classes14.dir}"/>
@@ -182,7 +186,7 @@
</target>
<target name="compile-tomcat-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/tomcat/**"/>
<classpath path="${build.classes14.dir}"/>
Modified: branches/tdiesler/trunk/build/import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/build/import/build-thirdparty.xml 2006-12-21 13:31:07 UTC (rev 1686)
+++ branches/tdiesler/trunk/build/import/build-thirdparty.xml 2006-12-21 13:46:32 UTC (rev 1687)
@@ -128,6 +128,10 @@
<pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/>
</path>
+ <!-- The classpath for the jboss42 integration -->
+ <path id="tomcat.integration.classpath">
+ </path>
+
</target>
</project>
19 years, 4 months
- 1
- 0
JBossWS SVN: r1686 - in branches/tdiesler/trunk/jbossws: . src src/main/java/org/jboss/ws/core/server
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 08:31:07 -0500 (Thu, 21 Dec 2006)
New Revision: 1686
Added:
branches/tdiesler/trunk/jbossws/.classpath
branches/tdiesler/trunk/jbossws/.project
Removed:
branches/tdiesler/trunk/jbossws/src/ant/
Modified:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java
Log:
partial commit
Added: branches/tdiesler/trunk/jbossws/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws/.classpath 2006-12-21 12:54:28 UTC (rev 1685)
+++ branches/tdiesler/trunk/jbossws/.classpath 2006-12-21 13:31:07 UTC (rev 1686)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/build"/>
+ <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/hibernate3.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/log4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/resolver.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/serializer.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Added: branches/tdiesler/trunk/jbossws/.project
===================================================================
--- branches/tdiesler/trunk/jbossws/.project 2006-12-21 12:54:28 UTC (rev 1685)
+++ branches/tdiesler/trunk/jbossws/.project 2006-12-21 13:31:07 UTC (rev 1686)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbossws</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java
===================================================================
--- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-21 12:54:28 UTC (rev 1685)
+++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-21 13:31:07 UTC (rev 1686)
@@ -32,8 +32,6 @@
import javax.management.ObjectName;
-import org.jboss.mx.loading.RepositoryClassLoader;
-
/**
* The container independent deployment info.
*
@@ -75,7 +73,7 @@
public URL localUrl;
public URLClassLoader annotationsCl;
public URLClassLoader localCl;
- public RepositoryClassLoader ucl;
+ public URLClassLoader ucl;
public ObjectName deployedObject;
/** The sortName concatenated with the canonical names of all parents. */
19 years, 4 months
- 1
- 0
JBossWS SVN: r1685 - in branches/tdiesler/trunk: build build/import jbossws/src/ant
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 07:54:28 -0500 (Thu, 21 Dec 2006)
New Revision: 1685
Added:
branches/tdiesler/trunk/build/import/
branches/tdiesler/trunk/build/import/build-release.xml
branches/tdiesler/trunk/build/import/build-samples.xml
branches/tdiesler/trunk/build/import/build-thirdparty.xml
Removed:
branches/tdiesler/trunk/jbossws/src/ant/build-release.xml
branches/tdiesler/trunk/jbossws/src/ant/build-samples.xml
branches/tdiesler/trunk/jbossws/src/ant/build-thirdparty.xml
Log:
partial commit
Copied: branches/tdiesler/trunk/build/import/build-release.xml (from rev 1683, branches/tdiesler/trunk/jbossws/src/ant/build-release.xml)
Copied: branches/tdiesler/trunk/build/import/build-samples.xml (from rev 1683, branches/tdiesler/trunk/jbossws/src/ant/build-samples.xml)
Copied: branches/tdiesler/trunk/build/import/build-thirdparty.xml (from rev 1683, branches/tdiesler/trunk/jbossws/src/ant/build-thirdparty.xml)
Deleted: branches/tdiesler/trunk/jbossws/src/ant/build-release.xml
===================================================================
--- branches/tdiesler/trunk/jbossws/src/ant/build-release.xml 2006-12-21 12:53:09 UTC (rev 1684)
+++ branches/tdiesler/trunk/jbossws/src/ant/build-release.xml 2006-12-21 12:54:28 UTC (rev 1685)
@@ -1,188 +0,0 @@
-<?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 default="release" name="JBossWS Release">
-
- <target name="release" depends="all,release-to-repository,release-to-portal" description="Release JBossWS">
- <echo message="*********************************************"/>
- <echo message="* Released: jbossws-${version.id}"/>
- <echo message="*"/>
- <echo message="* Almost there, please do these steps manually"/>
- <echo message="*"/>
- <echo message="* 1) Create SVN tag: jbossws-${version.id}"/>
- <echo message="* 2) Update portal-content/project.xml"/>
- <echo message="* 3) Update portal-content/counter.xml"/>
- <echo message="* 4) Update news in portal-content/freezone/projectDescription.xml"/>
- <echo message="* 5) Verify release notes and install instructions"/>
- <echo message="* 6) Commit the portal-content"/>
- <echo message="* 7) Commit the repository jars"/>
- <echo message="* 8) Write a stick post on the user forum"/>
- <echo message="* 9) Release the jbossws-${version.id} version in JIRA"/>
- <echo message="* 10) Post a message to jbossws-announce(a)lists.jboss.org"/>
- <echo message="* 11) Post a message to thecore(a)jboss.org"/>
- <echo message="*"/>
- <echo message="*********************************************"/>
- </target>
-
- <!-- Release to jboss.local.repository -->
- <target name="release-to-repository" depends="module-jars" description="Release to jboss.local.repository">
-
- <!-- jbossws -->
- <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
- <mkdir dir="${jbossws.dir}/lib"/>
- <copy todir="${jbossws.dir}/lib" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws.sar"/>
- <include name="jbossws.deployer"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss-integration.jar"/>
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Release to portal content -->
- <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available">
- <echo message="*********************************************"/>
- <echo message="* Not available: ${jbossws.portal.content}"/>
- <echo message="*********************************************"/>
- </target>
- <target name="release-to-portal" depends="check-portal-content" description="Release to portal-content" if="jbossws.portal.content.available">
-
- <property name="portal.freezone" value="${jbossws.portal.content}/freezone"/>
- <property name="portal.userguide" value="${portal.freezone}/user-guide"/>
- <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/>
-
- <!-- Copy user guide -->
- <copy todir="${portal.userguide}" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build">
- <include name="en/**"/>
- </fileset>
- </copy>
-
- <!-- Copy downloads -->
- <copy todir="${portal.downloads}" overwrite="true">
- <fileset dir="${build.dir}">
- <include name="jbossws-${version.id}.zip"/>
- <include name="jbossws-src-${version.id}.zip"/>
- <include name="jbossws-samples-${version.id}.zip"/>
- </fileset>
- </copy>
-
- <!-- Copy Release Notes -->
- <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${build.bin.dist}/ReleaseNotes.txt" overwrite="true"/>
- <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${build.bin.dist}/Install.txt" overwrite="true"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Build distributions -->
- <!-- ================================================================== -->
-
- <!-- Build the bin dist -->
- <target name="build-bin-dist" description="Build the binary distribution"
- depends="main,jbossws-thirdparty-jar,build-samples,build-docs">
-
- <mkdir dir="${build.bin.dist}"/>
- <mkdir dir="${build.bin.dist}/bin"/>
- <mkdir dir="${build.bin.dist}/docs/html"/>
- <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/>
- <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/>
- <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/>
- <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/>
- <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/>
-
- <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
- <copy todir="${build.bin.dist}" filtering="true" overwrite="true">
- <fileset dir="${src.dist.dir}"/>
- <filterset>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
- <copy todir="${build.bin.dist}/bin">
- <fileset dir="${src.etc.dir}">
- <include name="wstools.bat"/>
- <include name="wstools.sh"/>
- </fileset>
- </copy>
-
- <!-- samples -->
- <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
-
- <!-- documentation -->
- <copy todir="${build.bin.dist}/docs/html" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build/en/html"/>
- </copy>
- <copy todir="${build.bin.dist}/docs" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build/en/pdf"/>
- </copy>
-
- <!-- lib/jdk1.5 -->
- <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true">
- <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
- </copy>
-
- <!-- lib/tomcat -->
- <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="serializer.jar"/>
- <include name="xalan.jar"/>
- <include name="xercesImpl.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="activation.jar"/>
- <include name="log4j.jar"/>
- <include name="mailapi.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-core.jar"/>
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jbossws-thirdparty.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true">
- <fileset dir="${build.lib.dir}" includes="jbossws.war"/>
- </copy>
-
- <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
- </target>
-
- <!-- Build the src dist -->
- <target name="build-src-dist" description="Build the source distribution">
- <mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/>
- <copy todir="${build.src.dist}/jbossws-src-${version.id}">
- <fileset dir="${basedir}">
- <include name="ant.properties.example"/>
- <include name="version.properties"/>
- <include name="build.xml"/>
- <include name="src/**"/>
- <include name="docs/user-guide/**"/>
- </fileset>
- </copy>
- <zip destfile="${build.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
- includes="jbossws-src-${version.id}/**"/>
- </target>
-
-</project>
Deleted: branches/tdiesler/trunk/jbossws/src/ant/build-samples.xml
===================================================================
--- branches/tdiesler/trunk/jbossws/src/ant/build-samples.xml 2006-12-21 12:53:09 UTC (rev 1684)
+++ branches/tdiesler/trunk/jbossws/src/ant/build-samples.xml 2006-12-21 12:54:28 UTC (rev 1685)
@@ -1,353 +0,0 @@
-<?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:build-samples.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
-
-<project default="build-samples" name="JBossWS Samples">
-
- <!--
- | Build the samples
- -->
- <target name="build-samples" description="Builds the samples." depends="prepare">
-
- <property name="samples.target" value="jbossws-samples-${version.id}"/>
- <property name="build.src.samples.dir" value="${build.dir}/${samples.target}"/>
-
- <copy todir="${build.src.samples.dir}">
- <fileset dir="${src.samples.dir}">
- <include name="common/imported-build.xml"/>
- <include name="ant.properties.example"/>
- <include name="**/build.xml"/>
- </fileset>
- </copy>
-
- <mkdir dir="${build.src.samples.dir}/lib"/>
- <copy todir="${build.src.samples.dir}/lib">
- <fileset dir="${jboss.client}">
- <include name="commons-logging.jar"/>
- <include name="jbossall-client.jar"/>
- <include name="mail.jar"/>
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jboss-aspect-jdk50-client.jar"/>
- <include name="jboss-ejb3-client.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-jboss-integration.jar"/>
- <include name="jbossws-tomcat-integration.jar"/>
- </fileset>
- </copy>
-
- <!-- samples/common -->
- <mkdir dir="${build.src.samples.dir}/common/java"/>
- <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/>
-
- <copy todir="${build.src.samples.dir}/common/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/*.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources">
- <fileset dir="${src.samples.dir}/common">
- <include name="jndi.properties"/>
- <include name="log4j.xml"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples">
- <fileset dir="${test.resources.dir}/jaxrpc/samples-override"/>
- </copy>
-
- <!-- samples/docstyle -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/docstyle"/>
- </copy>
-
- <!-- samples/dynamichandler -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/dynamichandler"/>
- </copy>
-
- <!-- samples/exception -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/exception/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/exception"/>
- </copy>
-
- <!-- samples/handler -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/handler/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/handler"/>
- </copy>
-
- <!-- samples/holder -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/holder/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/holder"/>
- </copy>
-
- <!-- samples/jmstransport -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/jmstransport"/>
- </copy>
-
- <!-- samples/jsr109ejb -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109ejb"/>
- </copy>
-
- <!-- samples/jsr109pojo -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109pojo"/>
- </copy>
-
- <!-- samples/message -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/message/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/message/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/message/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/message"/>
- </copy>
-
- <!-- samples/mtom -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/mtom"/>
- </copy>
-
- <!-- samples/oneway -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/oneway"/>
- </copy>
-
- <!-- samples/rpcstyle -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/rpcstyle"/>
- </copy>
-
- <!-- samples/secureejb -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/secureejb"/>
- </copy>
-
- <!-- samples/swa -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/swa/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/swa"/>
- </copy>
-
- <!-- samples/wsbpel -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" />
- </copy>
-
- <!-- samples/wseventing -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/wseventing"/>
- </copy>
-
- <!-- samples/wssecurity -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources">
- <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity">
- <exclude name="store-pass-encrypt/**"/>
- </fileset>
- </copy>
-
- <!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- samples/jsr181ejb -->
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources">
- <fileset dir="${test.resources.dir}/jaxws/samples/jsr181ejb"/>
- </copy>
-
- <!-- samples/jsr181pojo -->
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources">
- <fileset dir="${test.resources.dir}/jaxws/samples/jsr181pojo"/>
- </copy>
-
- <!-- samples/wsaddressing -->
- <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources">
- <fileset dir="${test.resources.dir}/jaxws/samples/wsaddressing"/>
- </copy>
-
-
- <!-- samples/retail -->
- <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/retail/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/retail/resources">
- <fileset dir="${test.resources.dir}/jaxws/samples/retail"/>
- </copy>
-
- <!-- Build the samples zip -->
- <zip destfile="${build.dir}/${samples.target}.zip">
- <fileset dir="${build.dir}" includes="${samples.target}/**"/>
- </zip>
-
- </target>
-
-</project>
Deleted: branches/tdiesler/trunk/jbossws/src/ant/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/jbossws/src/ant/build-thirdparty.xml 2006-12-21 12:53:09 UTC (rev 1684)
+++ branches/tdiesler/trunk/jbossws/src/ant/build-thirdparty.xml 2006-12-21 12:54:28 UTC (rev 1685)
@@ -1,133 +0,0 @@
-<?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 default="init-thirdparty" name="JBossWS-Thirdparty">
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
- </target>
-
- <target name="thirdparty-get" if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
-
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.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"/>
- <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.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-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" 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}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.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-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.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-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy-1.0.jar" dest="${thirdparty.dir}/policy-1.0.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api-1.0.jar" dest="${thirdparty.dir}/stax-api-1.0.jar" usetimestamp="true" verbose="true"/>
- </target>
-
- <target name="thirdparty-classpath" >
-
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <pathelement location="${thirdparty.dir}/activation.jar"/>
- <pathelement location="${thirdparty.dir}/javassist.jar"/>
- <pathelement location="${thirdparty.dir}/concurrent.jar"/>
- <pathelement location="${thirdparty.dir}/log4j.jar"/>
- <pathelement location="${thirdparty.dir}/hibernate3.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-container.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
- <pathelement location="${thirdparty.dir}/mailapi.jar"/>
- <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
- <pathelement location="${thirdparty.dir}/qdox.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
- <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xml-apis.jar"/>
- <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
- <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
- </path>
-
- <!-- The classpath for the jbossws core -->
- <path id="jboss.core.classpath">
- <pathelement location="${jboss50.server.lib}/jboss-j2ee.jar"/>
- <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>
- </path>
-
- <!-- The classpath for the jboss50 integration -->
- <path id="jboss50.integration.classpath">
- <pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
- <pathelement location="${jboss50.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss50.lib}/jboss-mbeans.jar"/>
- <pathelement location="${jboss50.lib}/jboss-system.jar"/>
- <pathelement location="${jboss50.server.lib}/jboss.jar"/>
- <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/>
- <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
- </path>
-
- <!-- The classpath for the jboss42 integration -->
- <path id="jboss42.integration.classpath">
- <pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss42.lib}/jboss-system.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/>
- <pathelement location="${jboss42.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/>
- </path>
-
- </target>
-
-</project>
19 years, 4 months
- 1
- 0
JBossWS SVN: r1684 - in branches/tdiesler/trunk: integration-jboss42 integration-jboss42/src integration-jboss42/src/main integration-jboss42/src/main/java integration-jboss42/src/main/java/org integration-jboss42/src/main/java/org/jboss integration-jboss42/src/main/java/org/jboss/ws integration-jboss42/src/main/java/org/jboss/ws/integration integration-jboss50 integration-jboss50/src integration-jboss50/src/main integration-jboss50/src/main/java integration-jboss50/src/main/java/org integ
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 07:53:09 -0500 (Thu, 21 Dec 2006)
New Revision: 1684
Added:
branches/tdiesler/trunk/integration-jboss42/src/
branches/tdiesler/trunk/integration-jboss42/src/main/
branches/tdiesler/trunk/integration-jboss42/src/main/java/
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/
branches/tdiesler/trunk/integration-jboss50/src/
branches/tdiesler/trunk/integration-jboss50/src/main/
branches/tdiesler/trunk/integration-jboss50/src/main/java/
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/
branches/tdiesler/trunk/integration-tomcat/src/
branches/tdiesler/trunk/integration-tomcat/src/main/
branches/tdiesler/trunk/integration-tomcat/src/main/java/
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/
Removed:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/jboss42/
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/jboss50/
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/
Log:
partial commit
Copied: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42 (from rev 1683, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/jboss42)
Copied: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 (from rev 1683, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/jboss50)
Copied: branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat (from rev 1683, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat)
19 years, 4 months
- 1
- 0
JBossWS SVN: r1683 - in branches/tdiesler/trunk: . build jbossws jbossws/src jbossws/src/main/java/org/jboss/ws/integration/tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 07:40:22 -0500 (Thu, 21 Dec 2006)
New Revision: 1683
Added:
branches/tdiesler/trunk/build/
branches/tdiesler/trunk/build/JBossWSCodeStyle.xml
branches/tdiesler/trunk/build/README-COMMITTERS
branches/tdiesler/trunk/build/ant.properties.example
branches/tdiesler/trunk/build/build.xml
branches/tdiesler/trunk/build/version.properties
branches/tdiesler/trunk/integration-jboss42/
branches/tdiesler/trunk/integration-jboss50/
branches/tdiesler/trunk/integration-tomcat/
branches/tdiesler/trunk/jbossws/
branches/tdiesler/trunk/jbossws/src/
branches/tdiesler/trunk/jbossws/src/ant/
branches/tdiesler/trunk/jbossws/src/main/
branches/tdiesler/trunk/jbossws/src/test/
Removed:
branches/tdiesler/trunk/.classpath
branches/tdiesler/trunk/.project
branches/tdiesler/trunk/JBossWSCodeStyle.xml
branches/tdiesler/trunk/README-COMMITTERS
branches/tdiesler/trunk/STATUS_AND_NEWS.txt
branches/tdiesler/trunk/ant.properties.example
branches/tdiesler/trunk/build.xml
branches/tdiesler/trunk/jbossws/src/ant/
branches/tdiesler/trunk/jbossws/src/main/
branches/tdiesler/trunk/jbossws/src/test/
branches/tdiesler/trunk/src/
branches/tdiesler/trunk/version.properties
Modified:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java
Log:
partial commit
Deleted: branches/tdiesler/trunk/.classpath
===================================================================
--- branches/tdiesler/trunk/.classpath 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/.classpath 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="org/jboss/ws/integration/jboss50/**" kind="src" path="src/main/java"/>
- <classpathentry kind="lib" path="thirdparty/activation.jar"/>
- <classpathentry kind="lib" path="thirdparty/mailapi.jar"/>
- <classpathentry kind="lib" path="thirdparty/qdox.jar"/>
- <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/>
- <classpathentry kind="lib" path="thirdparty/xml-apis.jar"/>
- <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/>
- <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="thirdparty/xalan.jar"/>
- <classpathentry kind="lib" path="thirdparty/junit.jar"/>
- <classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
- <classpathentry kind="lib" path="thirdparty/javassist.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="thirdparty/policy-1.0.jar"/>
- <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/>
- <classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/ant.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-container.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/container/src/main"/>
- <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/>
- <classpathentry kind="output" path="output-eclipse"/>
-</classpath>
Deleted: branches/tdiesler/trunk/.project
===================================================================
--- branches/tdiesler/trunk/.project 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/.project 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>trunk</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Deleted: branches/tdiesler/trunk/JBossWSCodeStyle.xml
===================================================================
--- branches/tdiesler/trunk/JBossWSCodeStyle.xml 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/JBossWSCodeStyle.xml 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="8">
-<profile name="JBossWSCodeStyle" version="8">
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="3"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="168"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="3"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-</profile>
-</profiles>
Deleted: branches/tdiesler/trunk/README-COMMITTERS
===================================================================
--- branches/tdiesler/trunk/README-COMMITTERS 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/README-COMMITTERS 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,19 +0,0 @@
-1. Edit your subversion config ~/.subversion/config and set the following in each section:
-
-[miscellany]
-enable-auto-props = yes
-
-[auto-props]
-*.java = svn:keywords=Id Revision;svn:eol-style=LF
-*.xml = svn:keywords=Id Revision;svn:eol-style=LF
-*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF
-*.xsd = svn:keywords=Id Revision;svn:eol-style=LF
-*.txt = svn:keywords=Id Revision;svn:eol-style=LF
-
-2. If you are using an IDE, make sure that it refers to the same config. So,
-for example, if you are using Eclipse with Subclipse on windows, you need to
-set Team->SVN->Configuration Location to:
-
-c:\cygwin\home\<your user name>\.subversion
-
-3. If you are using Eclipse, set your code style to JBossWSCodeStyle.xml
Deleted: branches/tdiesler/trunk/STATUS_AND_NEWS.txt
===================================================================
--- branches/tdiesler/trunk/STATUS_AND_NEWS.txt 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/STATUS_AND_NEWS.txt 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,47 +0,0 @@
-# $Id$
-
-a
-18-Dec-2006
------------
-* All good with jbossas -r 59084
-
-11-Dec-2006
------------
-
-* Synchronize JAXWS API with 2.1
-* Add unimplemented methods
- BindingImpl: getBindingID
- HTTPBindingJAXWS: getBindingID
- SOAP11BindingJAXWS: getBindingID
- SOAP12BindingJAXWS: getBindingID
- MessageBindingJAXWS: getBindingID
- PayloadBindingJAXWS: getBindingID
- BindingProvider: getEndpointReference
- ClientImpl: getEndpointReference
- ServiceDelegateImpl: methods with WebServiceFeature
-
-23-Nov-2006
------------
-
-* You should expect to see no test failures against jbossas -r 58663
-* ant tests | grep FIXME | sort -u
- [junit] FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets
- [junit] FIXME: [JBAS-3825] Fix BASIC authentication
- [junit] FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called
- [junit] FIXME: [JBWS-1291] Fix JaxrpcMappingValidator
- [junit] FIXME: [JBWS-1294] Add support for mapping async methods
- [junit] FIXME: [JBWS-1297] Implement JAXB Fault Marshalling
- [junit] FIXME: [JBWS-1312] Fix JMS transport in trunk
- [junit] FIXME: [JBWS-1313] Fix XOP tests in trunk
- [junit] FIXME: [JBWS-1328] Client security configuration not loaded when client deployed with issolated classloader
- [junit] FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0
- [junit] FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0
- [junit] FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase in trunk
- [junit] FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x
- [junit] FIXME: [JBWS-269] Support attachments in Web Services Tools
- [junit] FIXME: [JBWS-434] Support sequences of anys
- [junit] FIXME: [JBWS-798] Complete EventingTestCase
- [junit] FIXME: [JBWS-868] BPEL in jbossws-samples
- [junit] FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums
- [junit] FIXME: [JBWS-981] Virtual host configuration for EJB endpoints
-
Deleted: branches/tdiesler/trunk/ant.properties.example
===================================================================
--- branches/tdiesler/trunk/ant.properties.example 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/ant.properties.example 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,36 +0,0 @@
-#
-# A sample ant properties file
-#
-
-# Required JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1
-
-# The JBoss server instance
-jboss.server.instance=default
-
-# Tomcat Home
-tomcat.home=/usr/java/tomcat
-tomcat.manager.username=manager
-tomcat.manager.password=manager
-
-# The target server the test endpoints are deployed to
-# This can be [jboss|tomcat]
-jbossws.target.server=jboss
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-jboss.repository=http://repository.jboss.com
-
-# JBossWS Release
-jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=yes
-javac.fail.onerror=yes
-javac.verbose=no
Copied: branches/tdiesler/trunk/build/JBossWSCodeStyle.xml (from rev 1675, branches/tdiesler/trunk/JBossWSCodeStyle.xml)
Copied: branches/tdiesler/trunk/build/README-COMMITTERS (from rev 1675, branches/tdiesler/trunk/README-COMMITTERS)
Copied: branches/tdiesler/trunk/build/ant.properties.example (from rev 1675, branches/tdiesler/trunk/ant.properties.example)
Copied: branches/tdiesler/trunk/build/build.xml (from rev 1675, branches/tdiesler/trunk/build.xml)
Copied: branches/tdiesler/trunk/build/version.properties (from rev 1675, branches/tdiesler/trunk/version.properties)
Deleted: branches/tdiesler/trunk/build.xml
===================================================================
--- branches/tdiesler/trunk/build.xml 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/build.xml 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,528 +0,0 @@
-<?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 default="main" name="JBossWS">
-
- <import file="${basedir}/src/ant/build-thirdparty.xml"/>
- <import file="${basedir}/src/ant/build-samples.xml"/>
- <import file="${basedir}/src/ant/build-release.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property file="ant.properties"/>
- <property file="version.properties"/>
-
- <property environment="env"/>
- <property name="build.dir" value="${basedir}/output"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.classes14.dir" value="${build.dir}/classes14"/>
- <property name="build.etc.dir" value="${build.dir}/etc"/>
- <property name="build.lib.dir" value="${build.dir}/lib"/>
- <property name="build.resources.dir" value="${build.dir}/resources"/>
- <property name="build.samples.dir" value="${build.dir}/samples"/>
- <property name="build.bin.dist" value="${build.dir}/bin-dist"/>
- <property name="build.src.dist" value="${build.dir}/src-dist"/>
- <property name="build.api" value="${build.dir}/api"/>
- <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
- <property name="src.dir" value="${basedir}/src/main"/>
- <property name="src.etc.dir" value="${src.dir}/etc"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.resources.dir" value="${src.dir}/resources"/>
- <property name="src.dist.dir" value="${src.resources.dir}/dist"/>
- <property name="src.samples.dir" value="${src.resources.dir}/samples"/>
- <property name="test.dir" value="${basedir}/src/test"/>
- <property name="test.etc.dir" value="${test.dir}/etc"/>
- <property name="test.java.dir" value="${test.dir}/java"/>
- <property name="test.resources.dir" value="${test.dir}/resources"/>
-
- <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
-
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
- <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
- <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/>
-
- <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
- <property name="tomcat.common.dir" value="${tomcat.home}/common"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <echo message="jboss50.home = ${jboss50.home}"/>
- <echo message="jboss42.home = ${jboss42.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
- <echo/>
-
- <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
- <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/>
- <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/>
- <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
- <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
- <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
-
- <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
- <checksum file="version.properties" fileext=".md5"/>
-
- <condition property="force.thirdparty.get">
- <or>
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
- <isfalse value="${checksum.ok}"/>
- </or>
- </condition>
-
- <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/>
- <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.ejb3.available"/>
-
- <tstamp>
- <format property="build.id" pattern="yyyyMMddHHmm"/>
- </tstamp>
-
- </target>
-
- <target name="init" depends="prepare, thirdparty">
-
- <!-- The combined compile classpath -->
- <path id="core.classpath">
- <path refid="library.classpath"/>
- <path refid="jboss.core.classpath"/>
- </path>
-
- </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,compile-resources" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
-
- <!-- Compile core java sources -->
- <target name="compile-interfaces" depends="init">
- <mkdir dir="${build.classes14.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
-
- <!-- Compile core java sources -->
- <target name="compile-core" depends="compile-interfaces">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
-
- <!-- Compile integration java sources -->
- <target name="compile-integration" depends="compile-jboss50-integration,compile-jboss42-integration,compile-tomcat-integration"/>
- <target name="compile-jboss50-integration" depends="compile-core">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss50/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="jboss50.integration.classpath"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
- <target name="compile-jboss42-integration" depends="compile-core">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss42/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="jboss42.integration.classpath"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
- <target name="compile-tomcat-integration" depends="compile-core">
- <mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/tomcat/**"/>
- <classpath path="${build.classes14.dir}"/>
- <classpath refid="tomcat.integration.classpath"/>
- <classpath refid="core.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${build.etc.dir}"/>
- <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes">
- <fileset dir="${src.etc.dir}"/>
- <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-${version.id}"/>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Compile resource files -->
- <target name="compile-resources" depends="init">
- <mkdir dir="${build.resources.dir}"/>
- <copy todir="${build.resources.dir}" filtering="yes" overwrite="yes">
- <fileset dir="${src.resources.dir}"/>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" description="Builds all jar files." depends="compile,module-jars">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars">
-
- <!-- Build jboss-jaxrpc.jar -->
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-saaj.jar -->
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes14.dir}">
- <include name="javax/xml/soap/**"/>
- </fileset>
- <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/>
- </jar>
-
- <!-- Build jboss-jaxws.jar -->
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="javax/jws/**"/>
- <include name="javax/xml/ws/**"/>
- <include name="org/jboss/ws/jaxws/injection/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-core.jar -->
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
- </fileset>
- <fileset dir="${build.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-jboss50-integration.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-jboss50-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/integration/*.class"/>
- <include name="org/jboss/ws/integration/jboss50/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-jboss42-integration.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-jboss42-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/integration/*.class"/>
- <include name="org/jboss/ws/integration/jboss42/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-tomcat-integration.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes.dir}">
- <include name="org/jboss/ws/integration/tomcat/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-client.jar -->
- <jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/jboss50/**"/>
- <exclude name="org/jboss/ws/integration/tomcat/**"/>
- </fileset>
- <fileset dir="${build.resources.dir}/jbossws.sar">
- <include name="META-INF/standard-jaxrpc-client-config.xml"/>
- <include name="META-INF/standard-jaxws-client-config.xml"/>
- </fileset>
- <fileset dir="${build.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- <fileset dir="${build.etc.dir}">
- <include name="wstools.sh"/>
- <include name="wstools.bat"/>
- <include name="wstools-log4j.xml"/>
- </fileset>
- <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <war warfile="${build.lib.dir}/jbossws-context.war" webxml="${build.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
- <fileset dir="${build.resources.dir}/jbossws.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${build.resources.dir}/jbossws.war/JBoss/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws.war -->
- <war warfile="${build.lib.dir}/jbossws.war" webxml="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
- <fileset dir="${build.resources.dir}/jbossws.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <fileset dir="${build.resources.dir}/jbossws.war/Tomcat">
- <include name="META-INF/jboss-beans.xml"/>
- </fileset>
- <fileset dir="${build.resources.dir}/jbossws.sar">
- <include name="META-INF/standard-jaxrpc-client-config.xml"/>
- <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
- <include name="META-INF/standard-jaxws-client-config.xml"/>
- <include name="META-INF/standard-jaxws-endpoint-config.xml"/>
- </fileset>
- <classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF">
- <include name="log4j.xml"/>
- </classes>
- </war>
-
- <!-- Build jbossws.sar -->
- <jar jarfile="${build.lib.dir}/jbossws.sar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
- <include name="wstx-lgpl-2.9.3.jar"/>
- <include name="xmlsec.jar"/>
- </fileset>
- <fileset dir="${build.resources.dir}/jbossws.sar">
- <include name="META-INF/standard-jaxrpc-client-config.xml"/>
- <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
- <include name="META-INF/standard-jaxws-client-config.xml"/>
- <include name="META-INF/standard-jaxws-endpoint-config.xml"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws.deployer -->
- <jar jarfile="${build.lib.dir}/jbossws.deployer" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-jboss-integration.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jboss-jaxws.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="wsdl4j.jar"/>
- </fileset>
- <metainf dir="${build.resources.dir}/jbossws.deployer/META-INF">
- <include name="jbossws-deployer-beans.xml"/>
- </metainf>
- </jar>
-
- <zip destfile="${build.lib.dir}/jbossws-src.zip">
- <fileset dir="${src.java.dir}"/>
- </zip>
- </target>
-
- <!-- ================================================================== -->
- <!-- Documentation -->
- <!-- ================================================================== -->
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc">
-
- <mkdir dir="${build.api}"/>
- <javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <packageset dir="${src.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
- </packageset>
- <packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes">
- <include name="org/jboss/webservice/metadata/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <group title="Core" packages="org.jboss.ws.core*"/>
- <group title="Metadata" packages="org.jboss.ws.metadata*"/>
- <group title="Integration" packages="org.jboss.ws.integration*"/>
- <group title="Extensions" packages="org.jboss.ws.extensions*"/>
- <group title="Tools" packages="org.jboss.ws.tools*"/>
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to the server -->
- <target name="deploy-jbossws" depends="main" description="Deploy jbossws">
- <antcall target="deploy-to-server">
- <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/>
- <param name="jbossws" value="jbossws"/>
- </antcall>
- <antcall target="deploy-to-thirdparty">
- <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/>
- <param name="jbossws" value="jbossws"/>
- </antcall>
- </target>
-
- <!-- Deploy to jboss -->
- <target name="deploy-to-server">
- <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/client" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="${jbossws}-client.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.deploy.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws.deployer"/>
- <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
- <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
- <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
- </target>
-
- <!-- Deploy to jboss/thirdparty -->
- <target name="deploy-to-thirdparty" if="jboss.source.dist.available">
- <!-- Only needed for the JBossAS webservice testsuite
- <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
- -->
- </target>
-
- <!-- Deploy to Tomcat -->
- <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/>
- <copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/>
- <delete dir="${tomcat.webapps.dir}/jbossws"/>
- </target>
-
- <target name="jbossws-thirdparty-jar" unless="jbossws.thirdparty.available">
- <!-- Build jbossws-thirdparty.jar -->
- <mkdir dir="${build.lib.dir}/build"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
- <jar jarfile="${build.lib.dir}/jbossws-thirdparty.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.lib.dir}/build"/>
- </jar>
- <delete dir="${build.lib.dir}/build"/>
- </target>
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${build.dir}"/>
- </target>
-
- <target name="build-docs" description="Build the documentation">
- <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars"/>
-
- <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist">
- </target>
-
-</project>
\ No newline at end of file
Copied: branches/tdiesler/trunk/jbossws/src (from rev 1675, branches/tdiesler/trunk/src)
Copied: branches/tdiesler/trunk/jbossws/src/ant (from rev 1682, branches/tdiesler/trunk/src/ant)
Copied: branches/tdiesler/trunk/jbossws/src/main (from rev 1682, branches/tdiesler/trunk/src/main)
Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-12-21 12:40:22 UTC (rev 1683)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.integration.tomcat;
-// $Id: $
+// $Id$
import java.io.File;
import java.net.MalformedURLException;
Copied: branches/tdiesler/trunk/jbossws/src/test (from rev 1682, branches/tdiesler/trunk/src/test)
Deleted: branches/tdiesler/trunk/version.properties
===================================================================
--- branches/tdiesler/trunk/version.properties 2006-12-21 12:35:57 UTC (rev 1682)
+++ branches/tdiesler/trunk/version.properties 2006-12-21 12:40:22 UTC (rev 1683)
@@ -1,44 +0,0 @@
-
-# $Id$
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-2.0
-
-version.id=2.0.0.CR3.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services (JBossWS)
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# thirdparty library versions that are referenced in component-info.xml
-apache-xmlsec=1.3.0
-ibm-wsdl4j=1.5.2jboss
-javassist=3.4.GA
-jboss-common-core=2.0.2.CR1
-jboss-common-logging=2.0.1.GA
-jboss-jbossxb=1.0.0.CR7
-jboss-microcontainer=snapshot
-jboss-remoting=2.2.0.Alpha2
-
-# thirdparty library versions
-apache-ant=1.6.5
-apache-log4j=1.2.8
-apache-xalan=j_2.7.0
-apache-xerces=2.7.1
-hibernate=3.2.0.CR2
-jboss-backport-concurrent=2.1.0.GA
-jbpm-bpel=1.1.Beta2
-junit=3.8.1
-oswego-concurrent=1.3.4
-qdox=1.4
-stax-api=1.0
-sun-jaf=1.0.2
-sun-javamail=1.3.1
-sun-jaxb=2.0.3
-sun-servlet=2.4
-woodstox=2.0.6
-wscommons-policy=1.0
-xmlunit=1.0
19 years, 4 months
- 1
- 0
JBossWS SVN: r1682 - in branches/tdiesler/trunk/src/main/java/org/jboss/ws: core/server integration/jboss42 integration/jboss50 integration/tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 07:35:57 -0500 (Thu, 21 Dec 2006)
New Revision: 1682
Added:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java
Removed:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java
Modified:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
Log:
partial commit
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -1,262 +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.ws.core.server;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.Servlet;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
-import org.jboss.ws.core.utils.DOMWriter;
-import org.jboss.ws.core.utils.IOUtils;
-import org.jboss.ws.core.utils.JavaUtils;
-import org.w3c.dom.Element;
-
-/**
- * The publisher for web service endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public abstract class AbstractServiceEndpointPublisher
-{
- // default bean name
- public static final String BEAN_NAME = "ServiceEndpointPublisher";
-
- // The servlet init param in web.xml that is the service endpoint class
- public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl";
-
- // logging support
- private static Logger log = Logger.getLogger(AbstractServiceEndpointPublisher.class);
-
- // The configured service endpoint servlet
- protected String servletName;
-
- public String getServiceEndpointServlet()
- {
- return servletName;
- }
-
- public void setServiceEndpointServlet(String servletName)
- {
- this.servletName = servletName;
- }
-
- public abstract String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
-
- public abstract String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
-
- public URL rewriteWarWebXml(URL warURL)
- {
- File warFile = new File(warURL.getFile());
- if (warFile.isDirectory() == false)
- throw new WSException("Expected a war directory: " + warURL);
-
- File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
- if (webXML.isFile() == false)
- throw new WSException("Cannot find web.xml: " + webXML);
-
- try
- {
- // After redeployment there might be a stale copy of the original web.xml.org, we delete it
- File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
- orgWebXML.delete();
-
- // Rename the web.xml
- if (webXML.renameTo(orgWebXML) == false)
- throw new WSException("Cannot rename web.xml: " + orgWebXML);
-
- FileInputStream stream = new FileInputStream(orgWebXML);
- return rewriteWebXml(stream, webXML, null).toURL();
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- throw new WSException(e);
- }
- }
-
- public File rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception
- {
- if (dest == null)
- {
- dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory());
- dest.deleteOnExit();
- }
-
- Element root = DOMUtils.parse(source);
- modifyServletConfig(root, loader);
-
- FileOutputStream fos = new FileOutputStream(dest);
- new DOMWriter(fos).setPrettyprint(true).print(root);
- fos.flush();
- fos.close();
-
- return dest;
- }
-
- private Map<String, String> modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException
- {
- Map<String, String> sepTargetMap = new HashMap<String, String>();
-
- Iterator itServlets = DOMUtils.getChildElements(root, "servlet");
- while (itServlets.hasNext())
- {
- Element servletElement = (Element)itServlets.next();
- String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name"));
-
- // find the servlet-class
- Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class");
-
- // JSP
- if (classElement == null)
- continue;
-
- String servletClassName = DOMUtils.getTextContent(classElement).trim();
-
- // Get the servlet class
- Class servletClass = null;
- if (loader != null)
- {
- try
- {
- servletClass = loader.loadClass(servletClassName);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + servletClassName);
- }
- }
-
- String targetBeanName = null;
-
- // Nothing to do if we have an <init-param>
- if (isAlreadyModified(servletElement) == false)
- {
- // Check if it is a real servlet that we can ignore
- if (servletClass != null && JavaUtils.isAssignableFrom(Servlet.class, servletClass))
- {
- log.info("Ignore servlet: " + servletClassName);
- continue;
- }
- else if (servletClassName.endsWith("Servlet"))
- {
- log.info("Ignore <servlet-class> that ends with 'Servlet': " + servletClassName);
- continue;
- }
-
- // build a list of detached elements that come after <servlet-class>
- boolean startDetach = false;
- List<Element> detachedElements = new ArrayList<Element>();
- Iterator itDetached = DOMUtils.getChildElements(servletElement);
- while (itDetached.hasNext())
- {
- Element el = (Element)itDetached.next();
- if (startDetach == true)
- {
- detachedElements.add(el);
- servletElement.removeChild(el);
- }
- if (el.equals(classElement))
- {
- servletElement.removeChild(el);
- startDetach = true;
- }
- }
-
- // replace the class name
- classElement = (Element)DOMUtils.createElement("servlet-class");
- classElement.appendChild(DOMUtils.createTextNode(servletName));
- classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true);
- servletElement.appendChild(classElement);
-
- // add additional init params
- if (servletClassName.equals(servletName) == false)
- {
- Element paramElement = DOMUtils.createElement("init-param");
- paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(INIT_PARAM_SERVICE_ENDPOINT_IMPL));
- paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(servletClassName));
- paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true);
- servletElement.appendChild(paramElement);
- targetBeanName = servletClassName;
- }
-
- // reattach the elements
- itDetached = detachedElements.iterator();
- while (itDetached.hasNext())
- {
- Element el = (Element)itDetached.next();
- servletElement.appendChild(el);
- }
- }
- else
- {
- Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
- while (itParams.hasNext())
- {
- Element elParam = (Element)itParams.next();
- Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
- Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value");
- if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
- {
- targetBeanName = DOMUtils.getTextContent(elParamValue);
- }
- }
- }
-
- if (targetBeanName == null)
- throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
-
- sepTargetMap.put(linkName, targetBeanName.trim());
- }
-
- return sepTargetMap;
- }
-
- // Return true if the web.xml is already modified
- private boolean isAlreadyModified(Element servletElement)
- {
- Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
- while (itParams.hasNext())
- {
- Element elParam = (Element)itParams.next();
- Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
- if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
- return true;
- }
- return false;
- }
-}
\ No newline at end of file
Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java (from rev 1675, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java)
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-21 09:45:07 UTC (rev 1675)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -0,0 +1,260 @@
+/*
+ * 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.ws.core.server;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.Servlet;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.core.utils.IOUtils;
+import org.jboss.ws.core.utils.JavaUtils;
+import org.w3c.dom.Element;
+
+/**
+ * The publisher for web service endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public abstract class ServiceEndpointPublisher
+{
+ // default bean name
+ public static final String BEAN_NAME = "ServiceEndpointPublisher";
+
+ // The servlet init param in web.xml that is the service endpoint class
+ public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl";
+
+ // logging support
+ private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
+
+ // The configured service endpoint servlet
+ protected String servletName;
+
+ public String getServiceEndpointServlet()
+ {
+ return servletName;
+ }
+
+ public void setServiceEndpointServlet(String servletName)
+ {
+ this.servletName = servletName;
+ }
+
+ public abstract String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
+
+ public abstract String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
+
+ public URL rewriteWebXml(UnifiedDeploymentInfo udi)
+ {
+ URL warURL = udi.expandedWebApp;
+ return rewriteWebXml(warURL);
+ }
+
+ public URL rewriteWebXml(URL warURL)
+ {
+ File warFile = new File(warURL.getFile());
+ if (warFile.isDirectory() == false)
+ throw new WSException("Expected a war directory: " + warURL);
+
+ File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
+ if (webXML.isFile() == false)
+ throw new WSException("Cannot find web.xml: " + webXML);
+
+ try
+ {
+ // After redeployment there might be a stale copy of the original web.xml.org, we delete it
+ File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ orgWebXML.delete();
+
+ // Rename the web.xml
+ if (webXML.renameTo(orgWebXML) == false)
+ throw new WSException("Cannot rename web.xml: " + orgWebXML);
+
+ FileInputStream stream = new FileInputStream(orgWebXML);
+ return rewriteWebXml(stream, webXML, null);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WSException(e);
+ }
+ }
+
+ public URL rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception
+ {
+ if (dest == null)
+ {
+ dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory());
+ dest.deleteOnExit();
+ }
+
+ Element root = DOMUtils.parse(source);
+ modifyServletConfig(root, loader);
+
+ FileOutputStream fos = new FileOutputStream(dest);
+ new DOMWriter(fos).setPrettyprint(true).print(root);
+ fos.flush();
+ fos.close();
+
+ return dest.toURL();
+ }
+
+ private void modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException
+ {
+ Iterator itServlets = DOMUtils.getChildElements(root, "servlet");
+ while (itServlets.hasNext())
+ {
+ Element servletElement = (Element)itServlets.next();
+ String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name"));
+
+ // find the servlet-class
+ Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class");
+
+ // JSP
+ if (classElement == null)
+ continue;
+
+ String servletClassName = DOMUtils.getTextContent(classElement).trim();
+
+ // Get the servlet class
+ Class servletClass = null;
+ if (loader != null)
+ {
+ try
+ {
+ servletClass = loader.loadClass(servletClassName);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + servletClassName);
+ }
+ }
+
+ String targetBeanName = null;
+
+ // Nothing to do if we have an <init-param>
+ if (isAlreadyModified(servletElement) == false)
+ {
+ // Check if it is a real servlet that we can ignore
+ if (servletClass != null && JavaUtils.isAssignableFrom(Servlet.class, servletClass))
+ {
+ log.info("Ignore servlet: " + servletClassName);
+ continue;
+ }
+ else if (servletClassName.endsWith("Servlet"))
+ {
+ log.info("Ignore <servlet-class> that ends with 'Servlet': " + servletClassName);
+ continue;
+ }
+
+ // build a list of detached elements that come after <servlet-class>
+ boolean startDetach = false;
+ List<Element> detachedElements = new ArrayList<Element>();
+ Iterator itDetached = DOMUtils.getChildElements(servletElement);
+ while (itDetached.hasNext())
+ {
+ Element el = (Element)itDetached.next();
+ if (startDetach == true)
+ {
+ detachedElements.add(el);
+ servletElement.removeChild(el);
+ }
+ if (el.equals(classElement))
+ {
+ servletElement.removeChild(el);
+ startDetach = true;
+ }
+ }
+
+ // replace the class name
+ classElement = (Element)DOMUtils.createElement("servlet-class");
+ classElement.appendChild(DOMUtils.createTextNode(servletName));
+ classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true);
+ servletElement.appendChild(classElement);
+
+ // add additional init params
+ if (servletClassName.equals(servletName) == false)
+ {
+ Element paramElement = DOMUtils.createElement("init-param");
+ paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(INIT_PARAM_SERVICE_ENDPOINT_IMPL));
+ paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(servletClassName));
+ paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true);
+ servletElement.appendChild(paramElement);
+ targetBeanName = servletClassName;
+ }
+
+ // reattach the elements
+ itDetached = detachedElements.iterator();
+ while (itDetached.hasNext())
+ {
+ Element el = (Element)itDetached.next();
+ servletElement.appendChild(el);
+ }
+ }
+ else
+ {
+ Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
+ while (itParams.hasNext())
+ {
+ Element elParam = (Element)itParams.next();
+ Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
+ Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value");
+ if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
+ {
+ targetBeanName = DOMUtils.getTextContent(elParamValue);
+ }
+ }
+ }
+
+ if (targetBeanName == null)
+ throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
+ }
+ }
+
+ // Return true if the web.xml is already modified
+ private boolean isAlreadyModified(Element servletElement)
+ {
+ Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
+ while (itParams.hasNext())
+ {
+ Element elParam = (Element)itParams.next();
+ Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
+ if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -33,6 +33,7 @@
import org.jboss.mx.util.MBeanProxy;
import org.jboss.ws.core.server.KernelLocator;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
/**
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -32,6 +32,7 @@
import org.jboss.mx.server.Invocation;
import org.jboss.ws.WSException;
import org.jboss.ws.core.server.JAXWSDeployment;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
@@ -85,27 +86,11 @@
if (udi != null)
{
ServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
- Map<String, String> sepTargetMap = endpointPublisher.rewriteWebXml(udi);
- updateServiceEndpointTargetBeans(udi, sepTargetMap);
+ endpointPublisher.rewriteWebXml(udi);
}
return retn;
}
- private void updateServiceEndpointTargetBeans(UnifiedDeploymentInfo udi, Map<String, String> sepTargetMap)
- {
- UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
-
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
- {
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
- String targetBean = sepTargetMap.get(sepMetaData.getLinkName());
- sepMetaData.setServiceEndpointImplName(targetBean);
- }
- }
- }
-
/** Return true if the deployment is a web service endpoint
*/
protected boolean isWebserviceDeployment(DeploymentInfo di)
Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java (from rev 1675, branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java)
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21 09:45:07 UTC (rev 1675)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -0,0 +1,103 @@
+/*
+ * 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.ws.integration.jboss42;
+
+// $Id$
+
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * Publish the HTTP service endpoint to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class JBoss42ServiceEndpointPublisher extends ServiceEndpointPublisher
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(JBoss42ServiceEndpointPublisher.class);
+
+ public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ URL warURL = udi.localUrl;
+ DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
+ if (di == null)
+ throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
+
+ rewriteWebXml(udi);
+
+ // Preserve the repository config
+ DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
+ auxdi.repositoryConfig = di.getTopRepositoryConfig();
+ getMainDeployer().deploy(auxdi);
+ return "OK";
+ }
+
+ public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ getMainDeployer().undeploy(udi.localUrl);
+ return "OK";
+ }
+
+ public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi)
+ {
+ Set<String> links = new HashSet<String>();
+
+ UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
+
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ {
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
+ links.add(sepMetaData.getLinkName());
+
+ }
+ }
+
+ return links;
+ }
+
+ private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ return mainDeployer;
+ }
+}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -56,7 +56,7 @@
if (di == null)
throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
- rewriteWebXML(udi);
+ rewriteWebXml(udi);
// Preserve the repository config
DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -1,103 +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.ws.integration.jboss42;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.MBeanServer;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-
-/**
- * Publish the HTTP service endpoint to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class ServiceEndpointPublisher extends AbstractServiceEndpointPublisher
-{
- // provide logging
- private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
-
- public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- URL warURL = udi.localUrl;
- DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
- if (di == null)
- throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
-
- rewriteWarWebXml(warURL);
-
- // Preserve the repository config
- DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
- auxdi.repositoryConfig = di.getTopRepositoryConfig();
- getMainDeployer().deploy(auxdi);
- return "OK";
- }
-
- public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- getMainDeployer().undeploy(udi.localUrl);
- return "OK";
- }
-
- public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi)
- {
- Set<String> links = new HashSet<String>();
-
- UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
-
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
- {
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
- links.add(sepMetaData.getLinkName());
-
- }
- }
-
- return links;
- }
-
- private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
- return mainDeployer;
- }
-}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -28,15 +28,25 @@
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
import org.jboss.ws.core.server.KernelLocator;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
/**
- * An abstract web service deployer
+ * An abstract web service deployer.
+ *
+ * deploy(unit)
+ * if(isWebServiceDeployment)
+ * deployServiceEndoint
+ * udi = createUnifiedDeploymentInfo()
+ * ServiceEndpointDeployer.create(udi)
*
+ * undeploy(unit)
+ * undeployServiceEndoint
+ * ServiceEndpointDeployer.destroy(udi)
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 31-Oct-2006
*/
@@ -57,7 +67,11 @@
deployInternal(unit);
}
- private void deployInternal(DeploymentUnit unit) throws DeploymentException
+ /**
+ * Called when the deployment contains web service endpoints.
+ * Is private and handles recovery of failed deployments
+ */
+ private final void deployInternal(DeploymentUnit unit) throws DeploymentException
{
try
{
@@ -91,12 +105,12 @@
/** Create the unified deployment info from the deployment unit
*/
- protected abstract UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) throws DeploymentException;
+ protected abstract UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) throws Exception;
/** Create the unified deployment info and create the service endpoints
* through the ServiceEndpointDeployer
*/
- protected void deployServiceEndpoint(DeploymentUnit unit) throws DeploymentException
+ protected void deployServiceEndpoint(DeploymentUnit unit) throws Exception
{
UnifiedDeploymentInfo udi = createUnifiedDeploymentInfo(unit);
unit.addAttachment(UnifiedDeploymentInfo.class, udi);
@@ -110,7 +124,7 @@
destroyServiceEndpoint(udi, unit);
}
- protected void createServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws DeploymentException
+ protected void createServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception
{
log.debug("Create ServiceEndpoint: " + udi.getCanonicalName());
getServiceEndpointDeployer().create(udi);
@@ -130,7 +144,6 @@
{
UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class);
return (udi != null && udi.type == getDeploymentType() ? udi : null);
-
}
protected ServiceEndpointDeployer getServiceEndpointDeployer()
@@ -140,10 +153,10 @@
return (ServiceEndpointDeployer)entry.getTarget();
}
- protected ServiceEndpointPublisher getServiceEndpointPublisher()
+ protected JBoss50ServiceEndpointPublisher getServiceEndpointPublisher()
{
KernelRegistry registry = KernelLocator.getKernel().getRegistry();
- KernelRegistryEntry entry = registry.getEntry(AbstractServiceEndpointPublisher.BEAN_NAME);
- return (ServiceEndpointPublisher)entry.getTarget();
+ KernelRegistryEntry entry = registry.getEntry(ServiceEndpointPublisher.BEAN_NAME);
+ return (JBoss50ServiceEndpointPublisher)entry.getTarget();
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -39,18 +39,18 @@
public abstract class AbstractEJBDeployer extends AbstractDeployer
{
@Override
- protected void createServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws DeploymentException
+ protected void createServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception
{
// Create the service endpoint
super.createServiceEndpoint(udi, unit);
- // Generate the webapp and publish to tomcat
+ // Generate the webapp and publish through th publisher
try
{
UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
URL warURL = new ServiceEndpointGeneratorEJB3().generatWebDeployment(wsMetaData, unit);
unit.addAttachment(ServiceEndpointWebApp.class, new ServiceEndpointWebApp(warURL));
- getServiceEndpointPublisher().publishServiceEndpoint(warURL);
+ getServiceEndpointPublisher().publishServiceEndpoint(udi);
}
catch (Exception ex)
{
@@ -65,7 +65,7 @@
URL warURL = unit.getAttachment(ServiceEndpointWebApp.class).getWarURL();
try
{
- getServiceEndpointPublisher().destroyServiceEndpoint(warURL);
+ getServiceEndpointPublisher().destroyServiceEndpoint(udi);
}
catch (Exception ex)
{
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -24,6 +24,7 @@
//$Id$
import java.io.InputStream;
+import java.net.URL;
import java.util.Iterator;
import java.util.Set;
@@ -32,8 +33,7 @@
import org.jboss.metadata.NameValuePair;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
/**
* An abstract deployer for JSE Endpoints
@@ -43,61 +43,33 @@
*/
public abstract class AbstractJSEDeployer extends AbstractDeployer
{
- // The servlet init param in web.xml that is the service endpoint class
- public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl";
-
public AbstractJSEDeployer()
{
super();
super.setRelativeOrder(CLASSLOADER_DEPLOYER + 1);
}
- /** Create the unified deployment info and create and start th eservice endpoints
- * through the ServiceEndpointDeployer
+ /**
+ * After the service endpoint has successfully been deployed to the ServiceEndpointManager,
+ *
*/
@Override
- protected void deployServiceEndpoint(DeploymentUnit unit) throws DeploymentException
+ protected void deployServiceEndpoint(DeploymentUnit unit) throws Exception
{
// Call the super implementation
super.deployServiceEndpoint(unit);
// FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
- String altDD = generateAltDD(unit);
+ InputStream stream = unit.getDeploymentContext().getRoot().findChild("WEB-INF/web.xml").openStream();
+ URL webXml = getServiceEndpointPublisher().rewriteWebXml(stream, null, unit.getClassLoader());
- // modify the WebMetaData
- modifyWebMetaData(unit, altDD);
+ modifyWebMetaData(unit, webXml);
}
- private String generateAltDD(DeploymentUnit unit)
+ private void modifyWebMetaData(DeploymentUnit unit, URL altDD) throws DeploymentException
{
try
{
- InputStream stream = unit.getDeploymentContext().getRoot().findChild("WEB-INF/web.xml").openStream();
- ClassLoader loader = unit.getClassLoader();
- return getServiceEndpointPublisher().rewriteWebXml(stream, null, loader).toString();
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- WSException.rethrow("Could not generate alternate deployment descriptor", e);
- return null;
- }
- }
-
- @Override
- protected void undeployServiceEndpoint(DeploymentUnit unit, UnifiedDeploymentInfo udi)
- {
- // Call the super implementation
- super.undeployServiceEndpoint(unit, udi);
- }
-
- private void modifyWebMetaData(DeploymentUnit unit, String altDD) throws DeploymentException
- {
- try
- {
Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class);
if (allMetaData.size() > 0)
{
@@ -118,13 +90,13 @@
if (isAlreadyModified(servlet) == false)
{
servlet.setServletClass(serviceEndpointServlet);
- NameValuePair initParam = new NameValuePair(INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName);
+ NameValuePair initParam = new NameValuePair(ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName);
servlet.addInitParam(initParam);
}
-
- // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
- webMetaData.setAltDDPath(altDD);
}
+
+ // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
+ webMetaData.setAltDDPath(altDD.toExternalForm());
}
}
catch (Exception ex)
@@ -139,7 +111,7 @@
while (itParams.hasNext())
{
NameValuePair pair = (NameValuePair)itParams.next();
- if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(pair.getName()))
+ if (ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(pair.getName()))
return true;
}
return false;
Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java (from rev 1675, branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java)
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-21 09:45:07 UTC (rev 1675)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -0,0 +1,101 @@
+/*
+ * 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.ws.integration.jboss50;
+
+// $Id$
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
+import org.jboss.deployers.spi.deployment.MainDeployer;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.structure.DeploymentState;
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+
+/**
+ * Publish the HTTP service endpoint to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class JBoss50ServiceEndpointPublisher extends ServiceEndpointPublisher
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(JBoss50ServiceEndpointPublisher.class);
+
+ private MainDeployer mainDeployer;
+ private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
+
+ public MainDeployer getMainDeployer()
+ {
+ return mainDeployer;
+ }
+
+ public void setMainDeployer(MainDeployer mainDeployer)
+ {
+ this.mainDeployer = mainDeployer;
+ }
+
+ public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ URL warURL = udi.expandedWebApp;
+ log.debug("publishServiceEndpoint: " + warURL);
+
+ rewriteWebXml(warURL);
+ DeploymentContext context = createDeploymentContext(warURL);
+
+ mainDeployer.addDeploymentContext(context);
+ mainDeployer.process();
+
+ contextMap.put(warURL.toExternalForm(), context);
+ return "OK";
+ }
+
+ public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ URL warURL = udi.expandedWebApp;
+ log.debug("destroyServiceEndpoint: " + warURL);
+
+ DeploymentContext context = contextMap.get(warURL.toExternalForm());
+ if (context != null)
+ {
+ context.setState(DeploymentState.UNDEPLOYING);
+ mainDeployer.process();
+ mainDeployer.removeDeploymentContext(context.getName());
+
+ contextMap.remove(warURL.toExternalForm());
+ }
+ return "OK";
+ }
+
+ private DeploymentContext createDeploymentContext(URL warURL) throws Exception
+ {
+ VirtualFile file = VFS.getRoot(warURL);
+ return new AbstractDeploymentContext(file);
+ }
+}
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -1,98 +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.ws.integration.jboss50;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.structure.DeploymentState;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
-
-/**
- * Publish the HTTP service endpoint to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class ServiceEndpointPublisher extends AbstractServiceEndpointPublisher
-{
- // provide logging
- private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
-
- private MainDeployer mainDeployer;
- private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
-
- public MainDeployer getMainDeployer()
- {
- return mainDeployer;
- }
-
- public void setMainDeployer(MainDeployer mainDeployer)
- {
- this.mainDeployer = mainDeployer;
- }
-
- public String publishServiceEndpoint(URL warURL) throws Exception
- {
- log.debug("publishServiceEndpoint: " + warURL);
-
- rewriteWarWebXml(warURL);
- DeploymentContext context = createDeploymentContext(warURL);
-
- mainDeployer.addDeploymentContext(context);
- mainDeployer.process();
-
- contextMap.put(warURL.toExternalForm(), context);
- return "OK";
- }
-
- public String destroyServiceEndpoint(URL warURL) throws Exception
- {
- log.debug("destroyServiceEndpoint: " + warURL);
-
- DeploymentContext context = contextMap.get(warURL.toExternalForm());
- if (context != null)
- {
- context.setState(DeploymentState.UNDEPLOYING);
- mainDeployer.process();
- mainDeployer.removeDeploymentContext(context.getName());
-
- contextMap.remove(warURL.toExternalForm());
- }
- return "OK";
- }
-
- private DeploymentContext createDeploymentContext(URL warURL) throws Exception
- {
- VirtualFile file = VFS.getRoot(warURL);
- return new AbstractDeploymentContext(file);
- }
-}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -37,7 +37,7 @@
import javax.servlet.ServletContext;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
@@ -138,7 +138,7 @@
Element ipel = (Element)itParams.next();
String paramName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(ipel, "param-name"));
String paramValue = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(ipel, "param-value"));
- if (AbstractServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(paramName))
+ if (ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(paramName))
{
servletClassMap.put(servletName, paramValue);
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.ServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
/**
@@ -41,7 +41,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-May-2006
*/
-public class TomcatServiceEndpointPublisher extends AbstractServiceEndpointPublisher
+public class TomcatServiceEndpointPublisher extends ServiceEndpointPublisher
{
// logging support
private static Logger log = Logger.getLogger(TomcatServiceEndpointPublisher.class);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-12-21 10:11:41 UTC (rev 1681)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-12-21 12:35:57 UTC (rev 1682)
@@ -69,7 +69,7 @@
TomcatServiceEndpointPublisher publisher = new TomcatServiceEndpointPublisher();
publisher.setServiceEndpointServlet(servletName);
- publisher.rewriteWarWebXml(tmpDir.toURL());
+ publisher.rewriteWebXml(tmpDir.toURL());
File outFile = new File(destDir.getCanonicalPath() + "/" + warName);
outFile.getParentFile().mkdirs();
19 years, 4 months
- 1
- 0