JBossWS SVN: r3771 - in branches/jbossws-2.0/integration: jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-29 13:17:12 -0400 (Fri, 29 Jun 2007)
New Revision: 3771
Modified:
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
Log:
Fix context-root from application.xml
Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-29 15:33:18 UTC (rev 3770)
+++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.List;
+import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -43,8 +44,9 @@
*/
public abstract class AbstractApplicationMetaDataAdapter
{
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, ApplicationMetaData apmd)
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
{
+ ApplicationMetaData apmd = (ApplicationMetaData)di.metaData;
dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-29 15:33:18 UTC (rev 3770)
+++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
@@ -114,12 +114,12 @@
{
if (di.metaData instanceof WebMetaData)
{
- udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, (WebMetaData)di.metaData);
+ udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
udi.webappURL = udi.url;
}
else if (di.metaData instanceof ApplicationMetaData)
{
- udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, (ApplicationMetaData)di.metaData);
+ udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
}
else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
{
Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-06-29 15:33:18 UTC (rev 3770)
+++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
@@ -30,6 +30,9 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.deployment.J2eeModuleMetaData;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
@@ -48,19 +51,37 @@
*/
public class WebMetaDataAdapter
{
- public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, WebMetaData webMetaData)
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
{
- dep.getContext().addAttachment(WebMetaData.class, webMetaData);
-
+ String contextRoot = null;
+
+ WebMetaData wmd = (WebMetaData)di.metaData;
+ dep.getContext().addAttachment(WebMetaData.class, wmd);
+
+ if (di.parent != null)
+ {
+ J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData;
+ Iterator it = appmd.getModules();
+ while (it.hasNext())
+ {
+ J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
+ if (module.getFileName().equals(udi.simpleName))
+ contextRoot = module.getWebContext();
+ }
+ }
+
+ if (contextRoot == null)
+ contextRoot = wmd.getContextRoot();
+
UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(webMetaData.getContextRoot());
- umd.setServletMappings(webMetaData.getServletMappings());
- umd.setServletClassNames(getServletClassMap(webMetaData));
- umd.setConfigName(webMetaData.getConfigName());
- umd.setConfigFile(webMetaData.getConfigFile());
- umd.setSecurityDomain(webMetaData.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(webMetaData));
- umd.setSecurityMetaData(getSecurityMetaData(webMetaData.getSecurityContraints()));
+ umd.setContextRoot(contextRoot);
+ umd.setServletMappings(wmd.getServletMappings());
+ umd.setServletClassNames(getServletClassMap(wmd));
+ umd.setConfigName(wmd.getConfigName());
+ umd.setConfigFile(wmd.getConfigFile());
+ umd.setSecurityDomain(wmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+ umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
dep.getContext().addAttachment(UnifiedWebMetaData.class, umd);
return umd;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-29 15:33:18 UTC (rev 3770)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
@@ -30,6 +30,8 @@
import java.util.Map;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.deployment.J2eeModuleMetaData;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
@@ -52,11 +54,27 @@
{
public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
{
+ String contextRoot = null;
+
WebMetaData wmd = unit.getAttachment(WebMetaData.class);
dep.getContext().addAttachment(WebMetaData.class, wmd);
+ if (unit.getParent() != null)
+ {
+ J2eeApplicationMetaData appmd = unit.getParent().getAttachment(J2eeApplicationMetaData.class);
+ if (appmd != null)
+ {
+ J2eeModuleMetaData module = appmd.getModule(udi.simpleName);
+ if (module != null)
+ contextRoot = module.getWebContext();
+ }
+ }
+
+ if (contextRoot == null)
+ contextRoot = wmd.getContextRoot();
+
UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(wmd.getContextRoot());
+ umd.setContextRoot(contextRoot);
umd.setServletMappings(getServletMappings(wmd));
umd.setServletClassNames(getServletClassMap(wmd));
umd.setConfigName(wmd.getConfigName());
16 years, 9 months
- 1
- 0
JBossWS SVN: r3770 - branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-29 11:33:18 -0400 (Fri, 29 Jun 2007)
New Revision: 3770
Modified:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml
Log:
Fix context-root for 4.2.0.GA
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-06-29 15:12:44 UTC (rev 3769)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-06-29 15:33:18 UTC (rev 3770)
@@ -12,7 +12,7 @@
<jndi-name>ejb/RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
- <port-component-uri>/RoleSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
<!-- default secure-wsdl-access (false for jaxrpc) -->
@@ -23,7 +23,7 @@
<jndi-name>ejb/BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
- <port-component-uri>/BasicSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
<secure-wsdl-access>true</secure-wsdl-access>
@@ -34,7 +34,7 @@
<jndi-name>ejb/ConfidentialSLSB</jndi-name>
<port-component>
<port-component-name>ConfidentialSecured</port-component-name>
- <port-component-uri>/ConfidentialSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
<secure-wsdl-access>false</secure-wsdl-access>
</port-component>
16 years, 9 months
- 1
- 0
JBossWS SVN: r3769 - in branches/jbossws-2.0: jbossws-core/src/main/java/org/jboss/ws/core/server and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-29 11:12:44 -0400 (Fri, 29 Jun 2007)
New Revision: 3769
Added:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java
Modified:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
Log:
Add dummy WebServiceContext impl
Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java (rev 0)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java 2007-06-29 15:12:44 UTC (rev 3769)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.invocation;
+
+// $Id: WebServiceContextJSE.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $
+
+import java.security.Principal;
+
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A WebServiceContext implementation that has no access to
+ * a security context.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-Jun-2007
+ */
+public class WebServiceContextDummy extends AbstractWebServiceContext
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(WebServiceContextDummy.class);
+
+ public WebServiceContextDummy(MessageContext msgContext)
+ {
+ super(msgContext);
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ log.warn("No security context available");
+ return null;
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ log.warn("No security context available");
+ return false;
+ }
+}
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-06-29 14:53:18 UTC (rev 3768)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-06-29 15:12:44 UTC (rev 3769)
@@ -38,10 +38,10 @@
{
private HttpServletRequest httpRequest;
- public WebServiceContextJSE(MessageContext messageContext)
+ public WebServiceContextJSE(MessageContext msgContext)
{
- super(messageContext);
- httpRequest = (HttpServletRequest)messageContext.get(MessageContext.SERVLET_REQUEST);
+ super(msgContext);
+ httpRequest = (HttpServletRequest)msgContext.get(MessageContext.SERVLET_REQUEST);
if (httpRequest == null)
throw new IllegalStateException("Cannot obtain HTTPServletRequest from message context");
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-29 14:53:18 UTC (rev 3768)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-29 15:12:44 UTC (rev 3769)
@@ -36,6 +36,7 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.http.HTTPBinding;
import org.jboss.logging.Logger;
@@ -65,9 +66,11 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.WebServiceContextDummy;
import org.jboss.wsf.spi.invocation.WebServiceContextJSE;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsf.spi.utils.JavaUtils;
@@ -281,7 +284,19 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext instanceof SOAPMessageContextJAXWS)
{
- invContext.addAttachment(WebServiceContext.class, new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext));
+ if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE)
+ {
+ WebServiceContext wsContext;
+ if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
+ {
+ wsContext = new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext);
+ }
+ else
+ {
+ wsContext = new WebServiceContextDummy((SOAPMessageContextJAXWS)msgContext);
+ }
+ invContext.addAttachment(WebServiceContext.class, wsContext);
+ }
invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext);
}
if (msgContext instanceof SOAPMessageContextJAXRPC)
16 years, 9 months
- 1
- 0
JBossWS SVN: r3768 - in branches/jbossws-2.0/testsuite: src/resources/jaxws/samples/eardeployment/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-29 10:53:18 -0400 (Fri, 29 Jun 2007)
New Revision: 3768
Added:
branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml
Modified:
branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml
Log:
Fix context-root for nested jse endpoint
Modified: branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml 2007-06-29 14:36:14 UTC (rev 3767)
+++ branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml 2007-06-29 14:53:18 UTC (rev 3768)
@@ -52,6 +52,7 @@
<include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
Added: branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml (rev 0)
+++ branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml 2007-06-29 14:53:18 UTC (rev 3768)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This is only needed for JBoss-5.0 deployments -->
+
+<jboss-web>
+ <context-root>earjse</context-root>
+</jboss-web>
\ No newline at end of file
16 years, 9 months
- 1
- 0
JBossWS SVN: r3767 - in branches/jbossws-2.0/build/hudson/hudson-home/jobs: AS-Tests-AS-4.2 and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-29 10:36:14 -0400 (Fri, 29 Jun 2007)
New Revision: 3767
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
Log:
Test against 4.2.0.GA
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss42.url@</remote>
- <local>Branch_4_2</local>
+ <local>JBoss_4_2_0_GA</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -12,7 +12,7 @@
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS40_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -12,7 +12,7 @@
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS42_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -12,7 +12,7 @@
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS50_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-29 13:46:59 UTC (rev 3766)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-29 14:36:14 UTC (rev 3767)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
16 years, 9 months
- 1
- 0
JBossWS SVN: r3766 - branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-29 09:46:59 -0400 (Fri, 29 Jun 2007)
New Revision: 3766
Modified:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java
Log:
Update URLLoaderAdapter documentation
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-06-29 13:30:45 UTC (rev 3765)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-06-29 13:46:59 UTC (rev 3766)
@@ -30,9 +30,10 @@
import java.net.URLClassLoader;
/**
- * The default file adapter loads resources through an associated classloader.
- * If no classload is set, the the thread context classloader will be used.
+ * Load resources through a URLClassLoader.<br>
+ * NOTE: The associated classloader doesn't do parent delegation.
*
+ *
* @author Heiko.Braun(a)jboss.org
* @since 25.01.2007
*/
16 years, 9 months
- 1
- 0
JBossWS SVN: r3765 - in branches/jbossws-2.0: build/ant-import and 18 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-29 09:30:45 -0400 (Fri, 29 Jun 2007)
New Revision: 3765
Added:
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerMDB21.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java
Removed:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java
Modified:
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/build/ant.properties.example
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java
branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/test-excludes-jboss50.txt
Log:
Restore: svn merge -r3755:3758 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-29 13:30:45 UTC (rev 3765)
@@ -123,6 +123,8 @@
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.lib}/jboss-deployers-client-spi.jar"/>
+ <pathelement location="${jboss.lib}/jboss-deployers-core-spi.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-06-29 13:30:45 UTC (rev 3765)
@@ -5,7 +5,7 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
+#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA
#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
@@ -37,7 +37,7 @@
hudson.jboss50.rev=HEAD
hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss42.build=jboss-4.2.0.GA
+hudson.jboss42.build=jboss-4.2.1.GA
hudson.jboss42.rev=HEAD
hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
Added: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerMDB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerMDB21.java (rev 0)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerMDB21.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss50;
+
+// $Id: InvocationHandlerEJB21.java 3524 2007-06-09 17:28:37Z thomas.diesler(a)jboss.com $
+
+import java.lang.reflect.Method;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.AbstractInvocationHandler;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on MDB EJB21 endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerMDB21 extends AbstractInvocationHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class);
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ log.debug("Invoke: " + epInv.getJavaMethod().getName());
+
+ try
+ {
+ InvocationContext invContext = epInv.getInvocationContext();
+ Object targetBean = invContext.getTargetBean();
+ Class implClass = targetBean.getClass();
+ Method seiMethod = epInv.getJavaMethod();
+ Method implMethod = getImplMethod(implClass, seiMethod);
+
+ Object[] args = epInv.getArgs();
+ Object retObj = implMethod.invoke(targetBean, args);
+ epInv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+}
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-29 13:30:45 UTC (rev 3765)
@@ -125,8 +125,7 @@
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
- <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
- <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 13:30:45 UTC (rev 3765)
@@ -125,8 +125,7 @@
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
- <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
- <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 13:30:45 UTC (rev 3765)
@@ -129,8 +129,7 @@
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
- <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
- <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-29 13:30:45 UTC (rev 3765)
@@ -52,7 +52,7 @@
2) WebServiceDeployerJSE < WarDeployer
3) WebServiceMainDeployer
- Each WebServiceDeployer has a number of DeployerHooks registerd with it
+ Each WebServiceDeployer has a number of DeployerHooks registered with it
- WebServiceDeployerEJB
- WSDeployerHook_JAXRPC_EJB21
@@ -140,12 +140,12 @@
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
- <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
- <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
<entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry>
+ <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerMDB21</value></entry>
<entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry>
<entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry>
</map>
Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java (from rev 3758, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java)
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java (rev 0)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.binding;
+
+import java.util.HashMap;
+
+/**
+ * Allows introduction of arbitrary binding customization properties.<p>
+ * This may be different between stacks and addresses meta data binding
+ * (i.e JSR-181 to UnifiedMetaData) as well as JAVA to XML binding operations.
+ * <p>
+ * Supported properties need to be documented in subclasses.
+ *
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jun 28, 2007
+ */
+public abstract class BindingCustomization extends HashMap {
+
+}
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -21,17 +21,14 @@
*/
package org.jboss.wsf.spi.deployment;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
+import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import javax.management.ObjectName;
+import java.util.*;
+
/**
* A general JAXWS endpoint.
*
@@ -49,10 +46,10 @@
private RequestHandler requestHandler;
private InvocationHandler invocationHandler;
private LifecycleHandler lifecycleHandler;
- private JAXBHandler jaxbHandler;
private Map<Class, Object> attachments = new HashMap<Class, Object>();
private Map<String, Object> properties = new HashMap<String, Object>();
private EndpointMetrics metrics;
+ private List<BindingCustomization> bindingCustomizsations = new ArrayList<BindingCustomization>();
public BasicEndpoint()
{
@@ -81,15 +78,15 @@
this.targetBean = targetBean;
}
- public Class getTargetBeanClass()
+ public Class getTargetBeanClass()
{
if (targetBean == null)
throw new IllegalStateException("Target bean not set");
-
+
ClassLoader classLoader = service.getDeployment().getClassLoader();
if (classLoader == null)
throw new IllegalStateException("Deployment classloader not set");
-
+
Class beanClass;
try
{
@@ -101,7 +98,7 @@
}
return beanClass;
}
-
+
public ObjectName getName()
{
return name;
@@ -178,15 +175,33 @@
this.invocationHandler = handler;
}
- public JAXBHandler getJAXBHandler()
+ public List<BindingCustomization> getBindingCustomizations()
{
- return jaxbHandler;
+ return Collections.unmodifiableList(bindingCustomizsations);
}
- public void setJAXBHandler(JAXBHandler jaxbHandler)
+ /* Get a concrete binding customization */
+ public BindingCustomization getBindingCustomization(BindingCustomization customization)
{
+ BindingCustomization match = null;
+
+ Iterator<BindingCustomization> it = bindingCustomizsations.iterator();
+ while(it.hasNext())
+ {
+ BindingCustomization bc = it.next();
+ if(bc.getClass().equals(customization.getClass()))
+ {
+ match = bc;
+ }
+ }
+
+ return match;
+ }
+
+ public void addBindingCustomization(BindingCustomization customization)
+ {
assertEndpointSetterAccess();
- this.jaxbHandler = jaxbHandler;
+ bindingCustomizsations.add(customization);
}
public <T> T addAttachment(Class<T> key, Object value)
@@ -203,7 +218,7 @@
{
return (T)attachments.get(key);
}
-
+
public Set<String> getProperties()
{
return properties.keySet();
@@ -234,9 +249,9 @@
assertEndpointSetterAccess();
metrics.setEndpoint(this);
this.metrics = metrics;
-
+
}
-
+
private void assertEndpointSetterAccess()
{
if (state == EndpointState.STARTED)
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,15 +23,15 @@
// $Id$
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
+import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import javax.management.ObjectName;
+import java.util.List;
+import java.util.Set;
+
/**
* A general JAXWS endpoint.
*
@@ -107,13 +107,16 @@
/** Set the endpoint bean invoker */
void setInvocationHandler(InvocationHandler invoker);
-
- /** Get the JAXBHandler for this endpoint */
- JAXBHandler getJAXBHandler();
-
- /** Set the JAXBHandler for this endpoint */
- void setJAXBHandler(JAXBHandler handler);
-
+
+ /** Get all binding customizations for this endpoint */
+ List<BindingCustomization> getBindingCustomizations();
+
+ /* Get a concrete binding customization */
+ BindingCustomization getBindingCustomization(BindingCustomization bindingCustomization);
+
+ /** Add a binding customization to this endpoint*/
+ void addBindingCustomization (BindingCustomization bindingCustomization);
+
/** Get the endpoint metrics for this endpoint */
EndpointMetrics getEndpointMetrics();
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,15 +23,14 @@
//$Id$
-import java.util.Map;
-
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import java.util.Map;
+
/**
* A deployer that assigns the handlers to the Endpoint
*
@@ -42,7 +41,6 @@
{
private String requestHandler;
private String lifecycleHandler;
- private String jaxbHandler;
private Map<String,String> invocationHandler;
public void setLifecycleHandler(String handler)
@@ -60,11 +58,6 @@
this.invocationHandler = handlers;
}
- public void setJaxbHandler(String jaxbHandler)
- {
- this.jaxbHandler = jaxbHandler;
- }
-
@Override
public void create(Deployment dep)
{
@@ -73,7 +66,6 @@
ep.setRequestHandler(getRequestHandler(dep));
ep.setLifecycleHandler(getLifecycleHandler(dep));
ep.setInvocationHandler(getInvocationHandler(ep));
- ep.setJAXBHandler(getJAXBHandler(dep));
}
}
@@ -103,19 +95,6 @@
}
}
- private JAXBHandler getJAXBHandler(Deployment dep)
- {
- try
- {
- Class<?> handlerClass = dep.getClassLoader().loadClass(jaxbHandler);
- return (JAXBHandler)handlerClass.newInstance();
- }
- catch (Exception e)
- {
- throw new IllegalStateException("Cannot load jaxb handler: " + jaxbHandler);
- }
- }
-
private InvocationHandler getInvocationHandler(Endpoint ep)
{
Deployment dep = ep.getService().getDeployment();
Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -1,146 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.utils;
-
-import java.lang.reflect.Array;
-
-/**
- * Collected methods which allow easy implementation of <code>hashCode</code>.
- *
- * Example use case:
- * <pre>
- * public int hashCode(){
- * int result = HashCodeUtil.SEED;
- * //collect the contributions of various fields
- * result = HashCodeUtil.hash(result, fPrimitive);
- * result = HashCodeUtil.hash(result, fObject);
- * result = HashCodeUtil.hash(result, fArray);
- * return result;
- * }
- * </pre>
- */
-public final class HashCodeUtil
-{
-
- /**
- * An initial value for a <code>hashCode</code>, to which is added contributions
- * from fields. Using a non-zero value decreases collisons of <code>hashCode</code>
- * values.
- */
- public static final int SEED = 23;
-
- /**
- * booleans.
- */
- public static int hash(int aSeed, boolean aBoolean)
- {
- return firstTerm(aSeed) + (aBoolean ? 1 : 0);
- }
-
- /**
- * chars.
- */
- public static int hash(int aSeed, char aChar)
- {
- return firstTerm(aSeed) + (int)aChar;
- }
-
- /**
- * ints.
- */
- public static int hash(int aSeed, int aInt)
- {
- /*
- * Implementation Note
- * Note that byte and short are handled by this method, through
- * implicit conversion.
- */
- return firstTerm(aSeed) + aInt;
- }
-
- /**
- * longs.
- */
- public static int hash(int aSeed, long aLong)
- {
- return firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32));
- }
-
- /**
- * floats.
- */
- public static int hash(int aSeed, float aFloat)
- {
- return hash(aSeed, Float.floatToIntBits(aFloat));
- }
-
- /**
- * doubles.
- */
- public static int hash(int aSeed, double aDouble)
- {
- return hash(aSeed, Double.doubleToLongBits(aDouble));
- }
-
- /**
- * <code>aObject</code> is a possibly-null object field, and possibly an array.
- *
- * If <code>aObject</code> is an array, then each element may be a primitive
- * or a possibly-null object.
- */
- public static int hash(int aSeed, Object aObject)
- {
- int result = aSeed;
- if (aObject == null)
- {
- result = hash(result, 0);
- }
- else if (!isArray(aObject))
- {
- result = hash(result, aObject.hashCode());
- }
- else
- {
- int length = Array.getLength(aObject);
- for (int idx = 0; idx < length; ++idx)
- {
- Object item = Array.get(aObject, idx);
- //recursive call!
- result = hash(result, item);
- }
- }
- return result;
- }
-
- /// PRIVATE ///
- private static final int fODD_PRIME_NUMBER = 37;
-
- private static int firstTerm(int aSeed)
- {
- return fODD_PRIME_NUMBER * aSeed;
- }
-
- private static boolean isArray(Object aObject)
- {
- return aObject.getClass().isArray();
- }
-}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -42,6 +42,7 @@
import javax.xml.ws.WebServiceException;
import org.w3c.dom.Element;
+import org.jboss.ws.core.jaxws.JAXBContextFactory;
/**
@@ -66,12 +67,12 @@
@XmlRootElement(name="EndpointReference",namespace=W3CEndpointReference.NS)
@XmlType(name="EndpointReferenceType",namespace=W3CEndpointReference.NS)
public final class W3CEndpointReference extends EndpointReference {
-
+
private final static JAXBContext w3cjc = getW3CJaxbContext();
protected W3CEndpointReference() {
}
-
+
/**
* construct an EPR from infoset representation
*
@@ -79,10 +80,10 @@
* instance consistent with the W3C WS-Addressing Core
* recommendation.
*
- * @throws WebServiceException
+ * @throws WebServiceException
* If the source does NOT contain a valid W3C WS-Addressing
* EndpointReference.
- * @throws NullPointerException
+ * @throws NullPointerException
* If the <code>null</code> <code>source</code> value is given
*/
public W3CEndpointReference(Source source) {
@@ -97,7 +98,7 @@
throw new WebServiceException("Source did not contain W3CEndpointReference", e);
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -110,15 +111,11 @@
throw new WebServiceException("Error marshalling W3CEndpointReference. ", e);
}
}
-
+
private static JAXBContext getW3CJaxbContext() {
- try {
- return JAXBContext.newInstance(W3CEndpointReference.class);
- } catch (JAXBException e) {
- throw new WebServiceException("Error creating JAXBContext for W3CEndpointReference. ", e);
- }
+ return JAXBContextFactory.newInstance().createContext(new Class[] { W3CEndpointReference.class});
}
-
+
// private but necessary properties for databinding
@XmlElement(name="Address",namespace=NS)
private Address address;
@@ -130,8 +127,8 @@
Map<QName,String> attributes;
@XmlAnyElement
List<Element> elements;
-
-
+
+
private static class Address {
protected Address() {}
@XmlValue
@@ -139,8 +136,8 @@
@XmlAnyAttribute
Map<QName,String> attributes;
}
-
-
+
+
private static class Elements {
protected Elements() {}
@XmlAnyElement
@@ -148,6 +145,6 @@
@XmlAnyAttribute
Map<QName,String> attributes;
}
-
+
protected static final String NS = "http://www.w3.org/2005/08/addressing";
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -53,7 +53,7 @@
import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory;
-import org.jboss.wsf.spi.utils.HashCodeUtil;
+import org.jboss.ws.core.utils.HashCodeUtil;
import org.jboss.wsf.spi.utils.JavaUtils;
/**
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.jaxws;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.wsf.spi.binding.BindingCustomization;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import java.util.Iterator;
+
+/**
+ * The default factory checks if a {@link JAXBBindingCustomization} exists
+ * and uses it to customize the JAXBContext that will be created.
+ *
+ * @see org.jboss.wsf.spi.deployment.Endpoint
+ * @see org.jboss.wsf.spi.binding.BindingCustomization
+ * @see JAXBBindingCustomization
+ *
+ * @see JAXBContext#newInstance(Class...)
+ * @see JAXBContext#newInstance(String, ClassLoader, java.util.Map<java.lang.String,?>)
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jun 26, 2007
+ */
+public class CustomizableJAXBContextFactory extends JAXBContextFactory
+{
+ public JAXBContext createContext(Class[] clazzes) throws WSException
+ {
+ try
+ {
+ BindingCustomization customization = getCustomization();
+ if(null == customization)
+ return JAXBContext.newInstance(clazzes);
+ else
+ return JAXBContext.newInstance(clazzes, customization);
+ }
+ catch (JAXBException e) {
+ throw new WSException("Failed to create JAXBContext", e);
+ }
+ }
+
+ public JAXBContext createContext(Class clazz) throws WSException
+ {
+ return createContext(new Class[] {clazz});
+ }
+
+ private BindingCustomization getCustomization()
+ {
+ BindingCustomization customization = null;
+
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ if(msgContext!=null) // may not be available anytime
+ {
+ Iterator<BindingCustomization> it = msgContext.getEndpointMetaData().getBindingCustomizations().iterator();
+ while(it.hasNext())
+ {
+ BindingCustomization current = it.next();
+ if(current instanceof JAXBBindingCustomization)
+ {
+ customization = current;
+ break;
+ }
+ }
+ }
+
+ return customization;
+ }
+}
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.jaxws;
+
+import org.jboss.wsf.spi.binding.BindingCustomization;
+import com.sun.xml.bind.api.JAXBRIContext;
+
+/**
+ * Supported JAXB 2.1 customizations.
+ *
+ * @see org.jboss.wsf.spi.deployment.Endpoint
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jun 28, 2007
+ */
+public class JAXBBindingCustomization extends BindingCustomization {
+
+ // Use an alternative RuntimeAnnotationReader implementation
+ public final static String ANNOTATION_READER = JAXBRIContext.ANNOTATION_READER;
+
+ // Reassign the default namespace URI to something else at the runtime
+ public final static String DEFAULT_NAMESPACE_REMAP = JAXBRIContext.DEFAULT_NAMESPACE_REMAP;
+
+ // Enable the c14n marshalling support in the JAXBContext.
+ public final static String CANONICALIZATION_SUPPORT = JAXBRIContext.CANONICALIZATION_SUPPORT;
+
+
+}
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,89 @@
+/*
+ * 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.jaxws;
+
+// $Id$
+
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.utils.HashCodeUtil;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+
+import javax.xml.bind.JAXBContext;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Cache JAXBContext's.
+ *
+ * @author Heiko.Braun(a)jboss.org
+ * @since 26.01.2007
+ */
+public class JAXBContextCache
+{
+ private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
+
+ public JAXBContext get(Class[] clazzes)
+ {
+ Integer id = buildId(clazzes);
+ return get(id);
+ }
+
+ public void add(Class[] clazzes, JAXBContext context)
+ {
+ Integer id = buildId(clazzes);
+ add(id, context);
+ }
+
+ private JAXBContext get(Integer id)
+ {
+ return cache.get(id);
+ }
+
+ private void add(Integer id, JAXBContext context)
+ {
+ cache.put(id, context);
+ }
+
+ private static Integer buildId(Class[] classes)
+ {
+ int sum = HashCodeUtil.SEED;
+ for (Class cls : classes)
+ {
+ sum = HashCodeUtil.hash(sum, cls.getName());
+ }
+ return sum;
+ }
+
+ /**
+ * Access the JAXBContext cache through the message context.
+ * The actual instance is assiciated with the EndpointMetaData.
+ * @return JAXBContextCache
+ */
+ public static JAXBContextCache getContextCache()
+ {
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
+ return epMetaData.getJaxbCache();
+ }
+}
+
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,31 @@
+/*
+ * 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.jaxws;
+
+import java.util.HashMap;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jun 27, 2007
+ */
+public class JAXBContextCustomisation extends HashMap {
+}
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,56 @@
+/*
+ * 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.jaxws;
+
+import org.jboss.ws.WSException;
+import org.jboss.wsf.spi.utils.ServiceLoader;
+
+import javax.xml.bind.JAXBContext;
+
+/**
+ * Creates JAXBContext's.<p>
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jun 26, 2007
+ */
+public abstract class JAXBContextFactory {
+
+ public final static String DEFAULT_JAXB_CONTEXT_FACTORY = "org.jboss.ws.core.jaxws.CustomizableJAXBContextFactory";
+
+ public abstract JAXBContext createContext(Class[] clazzes) throws WSException;
+
+ public abstract JAXBContext createContext(Class clazz) throws WSException;
+
+ /**
+ * Retrieve JAXBContextFactory instance through the {@link ServiceLoader}.
+ * Defaults to {@link CustomizableJAXBContextFactory}
+ * @return JAXBContextFactory
+ */
+ public static JAXBContextFactory newInstance()
+ {
+ return (JAXBContextFactory)ServiceLoader.loadService(
+ JAXBContextFactory.class.getName(),
+ DEFAULT_JAXB_CONTEXT_FACTORY
+ );
+ }
+}
+
\ No newline at end of file
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,22 +23,20 @@
// $Id$
+import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.TypeMappingImpl;
+import org.jboss.ws.core.binding.ComplexTypeDeserializer;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.logging.Logger;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.WebServiceException;
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.ComplexTypeDeserializer;
-import org.jboss.ws.core.binding.SerializationContext;
-import org.jboss.ws.core.binding.TypeMappingImpl;
-import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl;
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
-
/**
* A Deserializer that can handle complex types by delegating to JAXB.
*
@@ -66,11 +64,11 @@
TypeMappingImpl typeMapping = serContext.getTypeMapping();
Class javaType = typeMapping.getJavaType(xmlType);
- JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes);
-
+ JAXBContext jaxbContext = getJAXBContext(javaTypes);
+
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl());
-
+
JAXBElement jbe = unmarshaller.unmarshal(xmlFragment, javaType);
value = jbe.getValue();
@@ -84,6 +82,22 @@
}
+ /**
+ * Retrieve JAXBContext from cache or create new one and cache it.
+ * @param types
+ * @return JAXBContext
+ */
+ private JAXBContext getJAXBContext(Class[] types){
+ JAXBContextCache cache = JAXBContextCache.getContextCache();
+ JAXBContext context = cache.get(types);
+ if(null==context)
+ {
+ context = JAXBContextFactory.newInstance().createContext(types);
+ cache.add(types, context);
+ }
+ return context;
+ }
+
// 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall
// a request or unmarshall a response, an implementation MUST throw a WebServiceException whose
// cause is set to the original JAXBException.
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,6 +23,14 @@
// $Id$
+import org.jboss.logging.Logger;
+import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.ComplexTypeSerializer;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.w3c.dom.NamedNodeMap;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
@@ -31,15 +39,6 @@
import javax.xml.transform.Result;
import javax.xml.ws.WebServiceException;
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.BufferedStreamResult;
-import org.jboss.ws.core.binding.ComplexTypeSerializer;
-import org.jboss.ws.core.binding.SerializationContext;
-import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl;
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
-import org.w3c.dom.NamedNodeMap;
-
/**
* A Serializer that can handle complex types by delegating to JAXB.
*
@@ -67,10 +66,9 @@
// This should be more efficient and accurate than searching the type mapping
Class expectedType = serContext.getJavaType();
Class actualType = value.getClass();
+ Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType};
+ JAXBContext jaxbContext = getJAXBContext(types);
- Class[] javaTypes = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType};
- JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes);
-
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
@@ -91,6 +89,22 @@
return result;
}
+ /**
+ * Retrieve JAXBContext from cache or create new one and cache it.
+ * @param types
+ * @return JAXBContext
+ */
+ private JAXBContext getJAXBContext(Class[] types){
+ JAXBContextCache cache = JAXBContextCache.getContextCache();
+ JAXBContext context = cache.get(types);
+ if(null==context)
+ {
+ context = JAXBContextFactory.newInstance().createContext(types);
+ cache.add(types, context);
+ }
+ return context;
+ }
+
// Remove this when we add a XMLGregorianCalendar Serializer
private boolean shouldFilter(Class<?> actualType)
{
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -39,16 +39,5 @@
*/
public class SerializationContextJAXWS extends SerializationContext
{
- public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types";
-
- /**
- * Access the JAXBContext through the message context.
- * The actual instance is assiciated with the EndpointMetaData.
- */
- public static JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
- return epMetaData.getJAXBContext(javaTypes);
- }
+ public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types";
}
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.utils;
+
+import java.lang.reflect.Array;
+
+/**
+ * Collected methods which allow easy implementation of <code>hashCode</code>.
+ *
+ * Example use case:
+ * <pre>
+ * public int hashCode(){
+ * int result = HashCodeUtil.SEED;
+ * //collect the contributions of various fields
+ * result = HashCodeUtil.hash(result, fPrimitive);
+ * result = HashCodeUtil.hash(result, fObject);
+ * result = HashCodeUtil.hash(result, fArray);
+ * return result;
+ * }
+ * </pre>
+ */
+public final class HashCodeUtil
+{
+
+ /**
+ * An initial value for a <code>hashCode</code>, to which is added contributions
+ * from fields. Using a non-zero value decreases collisons of <code>hashCode</code>
+ * values.
+ */
+ public static final int SEED = 23;
+
+ /**
+ * booleans.
+ */
+ public static int hash(int aSeed, boolean aBoolean)
+ {
+ return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (aBoolean ? 1 : 0);
+ }
+
+ /**
+ * chars.
+ */
+ public static int hash(int aSeed, char aChar)
+ {
+ return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)aChar;
+ }
+
+ /**
+ * ints.
+ */
+ public static int hash(int aSeed, int aInt)
+ {
+ /*
+ * Implementation Note
+ * Note that byte and short are handled by this method, through
+ * implicit conversion.
+ */
+ return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + aInt;
+ }
+
+ /**
+ * longs.
+ */
+ public static int hash(int aSeed, long aLong)
+ {
+ return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32));
+ }
+
+ /**
+ * floats.
+ */
+ public static int hash(int aSeed, float aFloat)
+ {
+ return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Float.floatToIntBits(aFloat));
+ }
+
+ /**
+ * doubles.
+ */
+ public static int hash(int aSeed, double aDouble)
+ {
+ return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Double.doubleToLongBits(aDouble));
+ }
+
+ /**
+ * <code>aObject</code> is a possibly-null object field, and possibly an array.
+ *
+ * If <code>aObject</code> is an array, then each element may be a primitive
+ * or a possibly-null object.
+ */
+ public static int hash(int aSeed, Object aObject)
+ {
+ int result = aSeed;
+ if (aObject == null)
+ {
+ result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, 0);
+ }
+ else if (!org.jboss.ws.core.utils.HashCodeUtil.isArray(aObject))
+ {
+ result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, aObject.hashCode());
+ }
+ else
+ {
+ int length = Array.getLength(aObject);
+ for (int idx = 0; idx < length; ++idx)
+ {
+ Object item = Array.get(aObject, idx);
+ //recursive call!
+ result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, item);
+ }
+ }
+ return result;
+ }
+
+ /// PRIVATE ///
+ private static final int fODD_PRIME_NUMBER = 37;
+
+ private static int firstTerm(int aSeed)
+ {
+ return org.jboss.ws.core.utils.HashCodeUtil.fODD_PRIME_NUMBER * aSeed;
+ }
+
+ private static boolean isArray(Object aObject)
+ {
+ return aObject.getClass().isArray();
+ }
+}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.jaxws.JAXBContextFactory;
import org.jboss.ws.metadata.umdm.Accessor;
import org.jboss.ws.metadata.umdm.AccessorFactory;
import org.jboss.ws.metadata.umdm.AccessorFactoryCreator;
@@ -60,18 +61,8 @@
}
private AccessorFactory create(final Class clazz)
- {
- final JAXBRIContext ctx;
- try
- {
- ctx = (JAXBRIContext)JAXBRIContext.newInstance(new Class[] { clazz });
- }
- catch (JAXBException e)
- {
- WSException ex = new WSException(e.getMessage());
- ex.setStackTrace(e.getStackTrace());
- throw ex;
- }
+ {
+ final JAXBRIContext ctx = (JAXBRIContext) JAXBContextFactory.newInstance().createContext(clazz);
return new AccessorFactory()
{
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,15 +23,11 @@
// $Id$
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-
import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.wsf.spi.binding.jaxb.JAXBContextCache;
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+import javax.xml.namespace.QName;
+
/**
* Client side endpoint meta data.
*
@@ -40,7 +36,6 @@
*/
public class ClientEndpointMetaData extends EndpointMetaData
{
- private JAXBHandler jaxbHandler = new JAXBContextCache();
public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type)
{
@@ -53,12 +48,6 @@
configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE;
}
- @Override
- public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
- {
- return jaxbHandler.getJAXBContext(javaTypes);
- }
-
public String toString()
{
StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:");
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,25 +23,6 @@
// $Id$
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Observable;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.ws.Service.Mode;
-
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
@@ -52,21 +33,27 @@
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory;
+import org.jboss.ws.core.jaxws.JAXBContextCache;
+import org.jboss.ws.core.jaxws.JAXBContextFactory;
import org.jboss.ws.core.jaxws.JAXBDeserializerFactory;
import org.jboss.ws.core.jaxws.JAXBSerializerFactory;
import org.jboss.ws.core.jaxws.client.DispatchBinding;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.CommonConfig;
-import org.jboss.ws.metadata.config.Configurable;
-import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.ws.metadata.config.EndpointFeature;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.ws.metadata.config.*;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.utils.JavaUtils;
+import org.jboss.wsf.spi.binding.BindingCustomization;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.ws.Service.Mode;
+import java.lang.reflect.Method;
+import java.util.*;
+
/**
* A Service component describes a set of endpoints.
*
@@ -144,6 +131,10 @@
private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>();
+ private JAXBContextCache jaxbCache = new JAXBContextCache();
+
+ private List<BindingCustomization> bindingCustomization = new ArrayList<BindingCustomization>();
+
public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
this.serviceMetaData = service;
@@ -324,7 +315,9 @@
return type;
}
- public abstract JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException;
+ public List<BindingCustomization> getBindingCustomizations() {
+ return bindingCustomization;
+ }
public String getAuthMethod()
{
@@ -646,6 +639,11 @@
configObservable.addObserver(observer);
}
+ public JAXBContextCache getJaxbCache()
+ {
+ return jaxbCache;
+ }
+
public String getConfigFile()
{
return this.configFile;
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,17 +23,16 @@
// $Id$
-import javax.management.ObjectName;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.wsf.spi.binding.BindingCustomization;
+import javax.management.ObjectName;
+import javax.xml.namespace.QName;
+import java.util.List;
+
/**
* Client side endpoint meta data.
*
@@ -44,14 +43,14 @@
public class ServerEndpointMetaData extends EndpointMetaData
{
protected static final Logger log = Logger.getLogger(ServerEndpointMetaData.class);
-
+
public static final String SEPID_DOMAIN = "jboss.ws";
public static final String SEPID_PROPERTY_CONTEXT = "context";
public static final String SEPID_PROPERTY_ENDPOINT = "endpoint";
-
+
// The associated SPI endpoint
private Endpoint endpoint;
-
+
// The REQUIRED link name
private String linkName;
// Legacy JSR-109 port component name
@@ -187,11 +186,14 @@
{
this.secureWSDLAccess = secureWSDLAccess;
}
-
- @Override
- public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+
+ /**
+ * Will be set through a deployment aspect
+ * @return List<BindingCustomization> of available customizations
+ */
+ public List<BindingCustomization> getBindingCustomizations()
{
- return endpoint.getJAXBHandler().getJAXBContext(javaTypes);
+ return endpoint.getBindingCustomizations();
}
public String toString()
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -23,14 +23,11 @@
// $Id$
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.wsf.spi.binding.jaxb.BasicJAXBHandler;
+import javax.xml.namespace.QName;
+
/**
* Tools Endpoint Metadata
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
@@ -44,10 +41,4 @@
{
super(service, portName, portTypeName, Type.JAXRPC);
}
-
- @Override
- public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
- {
- return new BasicJAXBHandler().getJAXBContext(javaTypes);
- }
}
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java (from rev 3758, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.binding;
+
+import junit.framework.TestCase;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.BasicEndpoint;
+import org.jboss.ws.core.jaxws.JAXBBindingCustomization;
+
+import static org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
+import org.jboss.wsf.spi.binding.BindingCustomization;
+
+import java.util.List;
+import java.util.Iterator;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jun 28, 2007
+ */
+public class BindingCustomizationTestCase extends TestCase {
+
+ public void testCustomizationWriteAccess() throws Exception
+ {
+ Endpoint endpoint = new BasicEndpoint();
+ JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization();
+ jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization");
+ endpoint.addBindingCustomization(jaxbCustomization);
+
+ // a started endpoint should deny customizations
+ try
+ {
+ endpoint.setState(EndpointState.STARTED);
+ endpoint.addBindingCustomization(jaxbCustomization);
+
+ fail("It should not be possible to change bindinig customizations on a started endpoint");
+ }
+ catch (Exception e)
+ {
+ // all fine, this should happen
+ }
+ }
+
+ public void testCustomizationReadAccess() throws Exception
+ {
+ Endpoint endpoint = new BasicEndpoint();
+ JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization();
+ jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization");
+ endpoint.addBindingCustomization(jaxbCustomization);
+ endpoint.setState(EndpointState.STARTED);
+
+ // read a single customization
+ List<BindingCustomization> customizations = endpoint.getBindingCustomizations();
+
+ BindingCustomization knownCustomization = null;
+ Iterator<BindingCustomization> it = customizations.iterator();
+ while(it.hasNext())
+ {
+ knownCustomization = it.next();
+ break;
+ }
+
+ assertNotNull(knownCustomization);
+
+ // however the iteratoion should be unmodifiable
+ try
+ {
+ customizations.add( new JAXBBindingCustomization() );
+ fail("Started Endpoints should only axpose read acccess to their binding customizations");
+ }
+ catch (Exception e)
+ {
+ // all fine, we'd expect this
+ }
+
+
+ }
+}
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-29 13:30:45 UTC (rev 3765)
@@ -39,6 +39,7 @@
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
+import org.jboss.ws.core.jaxws.JAXBContextFactory;
/**
* Arrays with JSR181 endpoints
@@ -73,8 +74,8 @@
public void testNullArray() throws Exception
{
Integer[] intArr = null;
-
- JAXBContext jbc = JAXBContext.newInstance(Integer[].class);
+
+ JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class);
Marshaller m = jbc.createMarshaller();
m.setProperty(Marshaller.JAXB_FRAGMENT, true);
StringWriter strw = new StringWriter();
@@ -83,7 +84,7 @@
String xmlFragment = strw.toString();
// <myarr xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
// System.out.println(xmlFragment);
-
+
Unmarshaller um = jbc.createUnmarshaller();
Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes()));
JAXBElement jbel = um.unmarshal(source, Integer[].class);
@@ -93,8 +94,8 @@
public void testEmptyArray() throws Exception
{
Integer[] intArr = new Integer[0];
-
- JAXBContext jbc = JAXBContext.newInstance(Integer[].class);
+
+ JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class);
Marshaller m = jbc.createMarshaller();
m.setProperty(Marshaller.JAXB_FRAGMENT, true);
StringWriter strw = new StringWriter();
@@ -103,7 +104,7 @@
String xmlFragment = strw.toString();
// <myarr/>
// System.out.println(xmlFragment);
-
+
Unmarshaller um = jbc.createUnmarshaller();
Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes()));
JAXBElement jbel = um.unmarshal(source, Integer[].class);
@@ -113,8 +114,8 @@
public void testSingleValueArray() throws Exception
{
Integer[] intArr = new Integer[] { new Integer(1) };
-
- JAXBContext jbc = JAXBContext.newInstance(Integer[].class);
+
+ JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class);
Marshaller m = jbc.createMarshaller();
m.setProperty(Marshaller.JAXB_FRAGMENT, true);
StringWriter strw = new StringWriter();
@@ -123,7 +124,7 @@
String xmlFragment = strw.toString();
// <myarr><item>1</item></myarr>
// System.out.println(xmlFragment);
-
+
Unmarshaller um = jbc.createUnmarshaller();
Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes()));
JAXBElement jbel = um.unmarshal(source, Integer[].class);
@@ -133,8 +134,8 @@
public void testMultipleValueArray() throws Exception
{
Integer[] intArr = new Integer[] { new Integer(1), new Integer(2), new Integer(3) };
-
- JAXBContext jbc = JAXBContext.newInstance(Integer[].class);
+
+ JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class);
Marshaller m = jbc.createMarshaller();
m.setProperty(Marshaller.JAXB_FRAGMENT, true);
StringWriter strw = new StringWriter();
@@ -143,13 +144,13 @@
String xmlFragment = strw.toString();
// <myarr><item>1</item><item>2</item><item>3</item></myarr>
// System.out.println(xmlFragment);
-
+
Unmarshaller um = jbc.createUnmarshaller();
Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes()));
JAXBElement jbel = um.unmarshal(source, Integer[].class);
assertEquals(intArr, jbel.getValue());
}
-
+
public void testEchoNullArray() throws Exception
{
Integer[] outArr = endpoint.intArr("null", null);
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/samples/jmstransport/META-INF/ejb-jar.xml 2007-06-29 13:30:45 UTC (rev 3765)
@@ -7,7 +7,6 @@
<message-driven>
<ejb-name>OrganizationMDB</ejb-name>
<ejb-class>org.jboss.test.ws.jaxrpc.samples.jmstransport.OrganizationJMSEndpoint</ejb-class>
- <message-selector></message-selector>
<transaction-type>Container</transaction-type>
<acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
<message-driven-destination>
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-06-29 13:28:36 UTC (rev 3764)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-06-29 13:30:45 UTC (rev 3765)
@@ -13,8 +13,6 @@
org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
org/jboss/test/ws/jaxrpc/wsdlpublish/**
16 years, 9 months
- 1
- 0
JBossWS SVN: r3764 - branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-29 09:28:36 -0400 (Fri, 29 Jun 2007)
New Revision: 3764
Modified:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java
Log:
Eliminate parent delegation with URLLoaderAdapter
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-06-29 13:26:16 UTC (rev 3763)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-06-29 13:28:36 UTC (rev 3764)
@@ -29,8 +29,6 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-
/**
* The default file adapter loads resources through an associated classloader.
* If no classload is set, the the thread context classloader will be used.
@@ -118,8 +116,7 @@
{
if (loader == null)
{
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- loader = new URLClassLoader(new URL[]{rootURL}, ctxLoader);
+ loader = new URLClassLoader(new URL[]{rootURL});
}
return loader;
}
16 years, 9 months
- 1
- 0
JBossWS SVN: r3763 - branches/jbossws-2.0.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-29 09:26:16 -0400 (Fri, 29 Jun 2007)
New Revision: 3763
Removed:
branches/jbossws-2.0/jbossws-2.0.ipr
branches/jbossws-2.0/jbossws-2.0.iws
Log:
Remove intellij files
Deleted: branches/jbossws-2.0/jbossws-2.0.ipr
===================================================================
--- branches/jbossws-2.0/jbossws-2.0.ipr 2007-06-29 12:57:03 UTC (rev 3762)
+++ branches/jbossws-2.0/jbossws-2.0.ipr 2007-06-29 13:26:16 UTC (rev 3763)
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
- <component name="AntConfiguration">
- <defaultAnt bundledAnt="true" />
- </component>
- <component name="CodeStyleSettingsManager">
- <option name="PER_PROJECT_SETTINGS" />
- <option name="USE_PER_PROJECT_SETTINGS" value="false" />
- </component>
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
- <resourceExtensions>
- <entry name=".+\.(properties|xml|html|dtd|tld)" />
- <entry name=".+\.(gif|png|jpeg|jpg)" />
- </resourceExtensions>
- <wildcardResourcePatterns>
- <entry name="?*.properties" />
- <entry name="?*.xml" />
- <entry name="?*.gif" />
- <entry name="?*.png" />
- <entry name="?*.jpeg" />
- <entry name="?*.jpg" />
- <entry name="?*.html" />
- <entry name="?*.dtd" />
- <entry name="?*.tld" />
- </wildcardResourcePatterns>
- </component>
- <component name="DataSourceManagerImpl" />
- <component name="DependenciesAnalyzeManager">
- <option name="myForwardDirection" value="false" />
- </component>
- <component name="DependencyValidationManager" />
- <component name="EntryPointsManager">
- <entry_points />
- </component>
- <component name="ExportToHTMLSettings">
- <option name="PRINT_LINE_NUMBERS" value="false" />
- <option name="OPEN_IN_BROWSER" value="false" />
- <option name="OUTPUT_DIRECTORY" />
- </component>
- <component name="GUI Designer component loader factory" />
- <component name="JavacSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="JavadocGenerationManager">
- <option name="OUTPUT_DIRECTORY" />
- <option name="OPTION_SCOPE" value="protected" />
- <option name="OPTION_HIERARCHY" value="true" />
- <option name="OPTION_NAVIGATOR" value="true" />
- <option name="OPTION_INDEX" value="true" />
- <option name="OPTION_SEPARATE_INDEX" value="true" />
- <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
- <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
- <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
- <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
- <option name="OPTION_DEPRECATED_LIST" value="true" />
- <option name="OTHER_OPTIONS" value="" />
- <option name="HEAP_SIZE" />
- <option name="OPEN_IN_BROWSER" value="true" />
- </component>
- <component name="JikesSettings">
- <option name="JIKES_PATH" value="" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="DEPRECATION" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="IS_EMACS_ERRORS_MODE" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- </group>
- </component>
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
- <module fileurl="file://$PROJECT_DIR$/integration/native/int-native.iml" filepath="$PROJECT_DIR$/integration/native/int-native.iml" />
- <module fileurl="file://$PROJECT_DIR$/jbossws-core/jbossws-core.iml" filepath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" />
- <module fileurl="file://$PROJECT_DIR$/integration/spi/spi.iml" filepath="$PROJECT_DIR$/integration/spi/spi.iml" />
- </modules>
- </component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
- <component name="RmicSettings">
- <option name="IS_EANABLED" value="false" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="GENERATE_IIOP_STUBS" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <component name="libraryTable" />
- <component name="uidesigner-configuration">
- <option name="INSTRUMENT_CLASSES" value="true" />
- <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- </component>
- <UsedPathMacros />
-</project>
-
Deleted: branches/jbossws-2.0/jbossws-2.0.iws
===================================================================
--- branches/jbossws-2.0/jbossws-2.0.iws 2007-06-29 12:57:03 UTC (rev 3762)
+++ branches/jbossws-2.0/jbossws-2.0.iws 2007-06-29 13:26:16 UTC (rev 3763)
@@ -1,1077 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
- <component name="AspectsView" />
- <component name="BookmarkManager" />
- <component name="ChangeBrowserSettings">
- <option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
- <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
- <option name="USE_DATE_BEFORE_FILTER" value="false" />
- <option name="USE_DATE_AFTER_FILTER" value="false" />
- <option name="USE_CHANGE_BEFORE_FILTER" value="false" />
- <option name="USE_CHANGE_AFTER_FILTER" value="false" />
- <option name="DATE_BEFORE" value="" />
- <option name="DATE_AFTER" value="" />
- <option name="CHANGE_BEFORE" value="" />
- <option name="CHANGE_AFTER" value="" />
- <option name="USE_USER_FILTER" value="false" />
- <option name="USER" value="" />
- </component>
- <component name="CheckinPanelState" />
- <component name="Commander">
- <leftPanel />
- <rightPanel />
- <splitter proportion="0.5" />
- </component>
- <component name="CompilerWorkspaceConfiguration">
- <option name="COMPILE_IN_BACKGROUND" value="false" />
- <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
- <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
- <option name="COMPILE_DEPENDENT_FILES" value="false" />
- </component>
- <component name="Cvs2Configuration">
- <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
- <option name="MERGING_MODE" value="0" />
- <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" />
- <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
- <option name="RESET_STICKY" value="false" />
- <option name="CREATE_NEW_DIRECTORIES" value="true" />
- <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
- <option name="PROCESS_UNKNOWN_FILES" value="false" />
- <option name="PROCESS_DELETED_FILES" value="false" />
- <option name="PROCESS_IGNORED_FILES" value="false" />
- <option name="RESERVED_EDIT" value="false" />
- <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
- <value>
- <option name="BRANCH" value="" />
- <option name="DATE" value="" />
- <option name="USE_BRANCH" value="false" />
- <option name="USE_DATE" value="false" />
- </value>
- </option>
- <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
- <value>
- <option name="BRANCH" value="" />
- <option name="DATE" value="" />
- <option name="USE_BRANCH" value="false" />
- <option name="USE_DATE" value="false" />
- </value>
- </option>
- <option name="SHOW_CHANGES_REVISION_SETTINGS">
- <value>
- <option name="BRANCH" value="" />
- <option name="DATE" value="" />
- <option name="USE_BRANCH" value="false" />
- <option name="USE_DATE" value="false" />
- </value>
- </option>
- <option name="SHOW_OUTPUT" value="false" />
- <option name="ADD_WATCH_INDEX" value="0" />
- <option name="REMOVE_WATCH_INDEX" value="0" />
- <option name="UPDATE_KEYWORD_SUBSTITUTION" />
- <option name="MAKE_NEW_FILES_READONLY" value="false" />
- <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" />
- <option name="TAG_AFTER_PROJECT_COMMIT" value="false" />
- <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" />
- <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" />
- <option name="CLEAN_COPY" value="false" />
- </component>
- <component name="DaemonCodeAnalyzer">
- <disable_hints />
- </component>
- <component name="DebuggerManager">
- <breakpoint_any>
- <breakpoint>
- <option name="NOTIFY_CAUGHT" value="true" />
- <option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint>
- <option name="NOTIFY_CAUGHT" value="true" />
- <option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </breakpoint_any>
- <breakpoint_rules />
- <ui_properties />
- </component>
- <component name="ErrorTreeViewConfiguration">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="HIDE_WARNINGS" value="false" />
- </component>
- <component name="FavoritesViewImpl">
- <favorites_list name="jbossws-2.0">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="IS_SHOW_MEMBERS" value="false" />
- <option name="IS_STRUCTURE_VIEW" value="false" />
- <option name="IS_SHOW_MODULES" value="true" />
- <option name="IS_FLATTEN_PACKAGES" value="false" />
- <option name="IS_ABBREVIATION_PACKAGE_NAMES" value="false" />
- <option name="IS_HIDE_EMPTY_MIDDLE_PACKAGES" value="false" />
- <option name="IS_SHOW_LIBRARY_CONTENTS" value="true" />
- </favorites_list>
- <option name="myCurrentFavoritesList" value="jbossws-2.0" />
- </component>
- <component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="EndpointMetaData.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="318" column="34" selection-start="9810" selection-end="9810" vertical-scroll-proportion="0.3570567">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ServerEndpointMetaData.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="191" column="49" selection-start="5351" selection-end="5351" vertical-scroll-proportion="0.44549763">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="JAXBContextFactory.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="47" column="47" selection-start="1814" selection-end="1825" vertical-scroll-proportion="0.5687204">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CustomizableJAXBContextFactory.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="46" column="43" selection-start="1842" selection-end="1872" vertical-scroll-proportion="0.45023698">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FindManager">
- <FindUsagesManager>
- <setting name="OPEN_NEW_TAB" value="false" />
- </FindUsagesManager>
- </component>
- <component name="HierarchyBrowserManager">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="SORT_ALPHABETICALLY" value="false" />
- <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
- </component>
- <component name="InspectionManager">
- <option name="AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="SPLITTER_PROPORTION" value="0.5" />
- <option name="GROUP_BY_SEVERITY" value="false" />
- <option name="ANALYZE_TEST_SOURCES" value="true" />
- <option name="SCOPE_TYPE" value="1" />
- <option name="CUSTOM_SCOPE_NAME" value="" />
- <profile name="Default" />
- </component>
- <component name="J2EEProjectPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.j2ee.module.view.nodes.J2EEProjectNodeDescriptor" />
- </PATH_ELEMENT>
- </PATH>
- <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
- </component>
- <component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="jbossws-core" />
- <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
- </component>
- <component name="NamedScopeManager" />
- <component name="PackagesPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- </component>
- <component name="PerforceChangeBrowserSettings">
- <option name="USE_CLIENT_FILTER" value="true" />
- <option name="CLIENT" value="" />
- </component>
- <component name="PerforceDirect.Settings">
- <option name="useP4CONFIG" value="true" />
- <option name="port" value="<perforce_server>:1666" />
- <option name="client" value="" />
- <option name="user" value="" />
- <option name="passwd" value="" />
- <option name="showCmds" value="false" />
- <option name="useNativeApi" value="false" />
- <option name="pathToExec" value="p4" />
- <option name="useCustomPathToExec" value="false" />
- <option name="SYNC_FORCE" value="false" />
- <option name="SYNC_RUN_RESOLVE" value="true" />
- <option name="REVERT_UNCHANGED_FILES" value="true" />
- <option name="CHARSET" value="none" />
- <option name="SHOW_BRANCHES_HISTORY" value="true" />
- <option name="ENABLED" value="true" />
- <option name="USE_LOGIN" value="false" />
- <option name="LOGIN_SILENTLY" value="false" />
- <option name="INTEGRATE_BRANCH_NAME" />
- <option name="INTEGRATE_CHANGELIST_NUM" value="-1" />
- <option name="INTEGRATE_RUN_RESOLVE" value="true" />
- <option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
- <option name="INTEGRATE_CHANGE_LIST_NUMBER" value="" />
- <option name="INTEGRATE_CHANGE_LIST" value="false" />
- <option name="INTEGRATE_REVERSE" value="false" />
- </component>
- <component name="ProjectLevelVcsManager">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkin" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <OptionsSetting value="true" id="Undo Check Out" />
- <OptionsSetting value="true" id="Compare with SourceSafe Version" />
- <OptionsSetting value="true" id="Get Latest Version" />
- <ConfirmationsSetting value="0" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources/jbossws-core.jar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources/jbossws-core.jar/META-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.sar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.sar/META-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.deployer" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.deployer/META-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="build" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossws-2.0.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="build" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- </component>
- <component name="ProjectReloadState">
- <option name="STATE" value="0" />
- </component>
- <component name="ProjectView">
- <navigator currentView="ProjectPane" splitterProportion="0.5">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages PackagesPane="false" />
- <abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- </navigator>
- </component>
- <component name="PropertiesComponent">
- <property name="MemberChooser.copyJavadoc" value="false" />
- <property name="GoToClass.includeLibraries" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
- <property name="MemberChooser.sorted" value="false" />
- <property name="GoToFile.includeJavaFiles" value="false" />
- <property name="GoToClass.toSaveIncludeLibraries" value="false" />
- </component>
- <component name="ReadonlyStatusHandler">
- <option name="SHOW_DIALOG" value="true" />
- </component>
- <component name="RecentsManager">
- <key name="CopyClassDialog.RECENTS_KEY">
- <recent name="org.jboss.ws.core.utils" />
- </key>
- </component>
- <component name="RestoreUpdateTree" />
- <component name="RunManager">
- <activeType name="Application" />
- <configuration selected="false" default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- </configuration>
- <configuration selected="false" default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
- <configuration selected="false" default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
- </component>
- <component name="SelectInManager" />
- <component name="StarteamConfiguration">
- <option name="SERVER" value="" />
- <option name="PORT" value="49201" />
- <option name="USER" value="" />
- <option name="PASSWORD" value="" />
- <option name="PROJECT" value="" />
- <option name="VIEW" value="" />
- <option name="ALTERNATIVE_WORKING_PATH" value="" />
- </component>
- <component name="StructuralSearchPlugin" />
- <component name="StructureViewFactory">
- <option name="AUTOSCROLL_MODE" value="true" />
- <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
- <option name="ACTIVE_ACTIONS" value="ALPHA_COMPARATOR" />
- </component>
- <component name="SvnChangesBrowserSettings">
- <option name="USE_AUTHOR_FIELD" value="true" />
- <option name="AUTHOR" value="" />
- <option name="LOCATION" value="" />
- <option name="USE_PROJECT_SETTINGS" value="true" />
- <option name="USE_ALTERNATE_LOCATION" value="false" />
- </component>
- <component name="SvnConfiguration">
- <option name="USER" value="" />
- <option name="PASSWORD" value="" />
- <option name="PROCESS_UNRESOLVED" value="false" />
- <configuration useDefault="false">/home/hbraun/.subversion</configuration>
- <checkoutURL active="true">https://svn.jboss.org/repos/jbossws</checkoutURL>
- </component>
- <component name="TodoView" selected-index="0">
- <todo-panel id="selected-file">
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="true" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- </component>
- <component name="ToolWindowManager">
- <frame x="0" y="25" width="1690" height="1004" extended-state="6" />
- <editor active="true" />
- <layout>
- <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26164216" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.54846066" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3295325" order="8" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
- <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
- <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
- <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
- <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
- <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" />
- </layout>
- </component>
- <component name="VCS.FileViewConfiguration">
- <option name="SELECTED_STATUSES" value="DEFAULT" />
- <option name="SELECTED_COLUMNS" value="DEFAULT" />
- <option name="SHOW_FILTERS" value="true" />
- <option name="CUSTOMIZE_VIEW" value="true" />
- <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" />
- </component>
- <component name="VcsManagerConfiguration">
- <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
- <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
- <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" />
- <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
- <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
- <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
- <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
- <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
- <option name="ERROR_OCCURED" value="false" />
- <option name="ACTIVE_VCS_NAME" />
- <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
- <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
- <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- </component>
- <component name="VssConfiguration">
- <option name="CLIENT_PATH" value="" />
- <option name="SRCSAFEINI_PATH" value="" />
- <option name="USER_NAME" value="" />
- <option name="PWD" value="" />
- <option name="VSS_IS_INITIALIZED" value="true" />
- <CheckoutOptions>
- <option name="COMMENT" value="" />
- <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
- <option name="REPLACE_WRITABLE" value="false" />
- <option name="RECURSIVE" value="false" />
- </CheckoutOptions>
- <CheckinOptions>
- <option name="COMMENT" value="" />
- <option name="KEEP_CHECKED_OUT" value="false" />
- <option name="RECURSIVE" value="false" />
- </CheckinOptions>
- <AddOptions>
- <option name="COMMENT" value="" />
- <option name="STORE_ONLY_LATEST_VERSION" value="false" />
- <option name="CHECK_OUT_IMMEDIATELY" value="false" />
- <option name="FILE_TYPE" value="0" />
- </AddOptions>
- <UndocheckoutOptions>
- <option name="MAKE_WRITABLE" value="false" />
- <option name="REPLACE_LOCAL_COPY" value="0" />
- <option name="RECURSIVE" value="false" />
- </UndocheckoutOptions>
- <GetOptions>
- <option name="REPLACE_WRITABLE" value="0" />
- <option name="MAKE_WRITABLE" value="false" />
- <option name="RECURSIVE" value="false" />
- </GetOptions>
- </component>
- <component name="antWorkspaceConfiguration">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="FILTER_TARGETS" value="false" />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="81" column="41" selection-start="2474" selection-end="2474" vertical-scroll-proportion="0.66824645">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="142" column="94" selection-start="6593" selection-end="6593" vertical-scroll-proportion="0.40050697">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="131" column="94" selection-start="6468" selection-end="6468" vertical-scroll-proportion="0.32446134">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="127" column="94" selection-start="6226" selection-end="6226" vertical-scroll-proportion="0.32446134">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="125" column="100" selection-start="6015" selection-end="6038" vertical-scroll-proportion="0.27376425">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="43" column="47" selection-start="1777" selection-end="1777" vertical-scroll-proportion="0.050697085">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="1479" selection-end="1479" vertical-scroll-proportion="0.40557668">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="47" column="0" selection-start="1147" selection-end="1862" vertical-scroll-proportion="0.68441063">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployer.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="21" column="45" selection-start="1051" selection-end="1051" vertical-scroll-proportion="0.024271844">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="318" column="34" selection-start="9810" selection-end="9810" vertical-scroll-proportion="0.3570567">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="50" column="36" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.6350711">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-0.3127962">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="191" column="49" selection-start="5351" selection-end="5351" vertical-scroll-proportion="0.44549763">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="47" column="47" selection-start="1814" selection-end="1825" vertical-scroll-proportion="0.5687204">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="46" column="43" selection-start="1842" selection-end="1872" vertical-scroll-proportion="0.45023698">
- <folding />
- </state>
- </provider>
- </entry>
- </component>
-</project>
-
16 years, 9 months
- 1
- 0
JBossWS SVN: r3762 - in branches/jbossws-2.0: integration/jboss50/ant-import and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-29 08:57:03 -0400 (Fri, 29 Jun 2007)
New Revision: 3762
Modified:
branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
Log:
Update to new deployer architecture
Modified: branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
===================================================================
--- branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-06-29 12:57:03 UTC (rev 3762)
@@ -13,24 +13,23 @@
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
</library>
<library name="jboss-4.2.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-common.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-j2ee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/servlet-api.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jbosssx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-jmx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-ejb3x.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-common.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-j2ee.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-xml-binding.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/servlet-api.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jbosssx.jar"/>
</library>
<library name="jboss-5.0.x" systemlibrary="false">
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-j2se.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-javaee.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system.jar"/>
@@ -48,5 +47,10 @@
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/antlr.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-security-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-core-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar"/>
</library>
</eclipse-userlibraries>
Modified: branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-06-29 12:57:03 UTC (rev 3762)
@@ -40,7 +40,11 @@
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
<pathelement location="${jboss50.lib}/jboss-system.jar"/>
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -21,9 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeployerManager;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -31,6 +29,9 @@
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
+//$Id$
+
+
/**
* An abstract web service deployer.
*
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
//$Id$
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,9 +24,10 @@
import java.util.LinkedList;
import java.util.List;
-import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
//$Id$
@@ -37,13 +38,13 @@
* @author Thomas.Diesler(a)jboss.org
* @since 24-Apr-2007
*/
-public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer
+public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
{
// provide logging
private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
-
+
public void addDeployerHook(DeployerHook deployer)
{
log.debug("Add deployer hook: " + deployer);
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -26,7 +26,8 @@
import java.net.URL;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -143,7 +144,7 @@
private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
{
- VirtualFile vf = unit.getMetaDataFile("webservices.xml");
+ VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml");
return (vf != null ? new VirtualFileAdaptor(vf) : null);
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* An interface for all web service deployer hooks
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,7 +24,8 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
@@ -70,13 +71,13 @@
try
{
- if (unit.getDeploymentContext().getParent() != null)
+ if (unit.getParent() != null)
{
udi.parent = new UnifiedDeploymentInfo(null);
- buildDeploymentInfo(dep, udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit());
+ buildDeploymentInfo(dep, udi.parent, unit.getParent());
}
- udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
+ udi.vfRoot = new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot());
udi.name = unit.getName();
udi.simpleName = unit.getSimpleName();
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,8 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -53,7 +54,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,8 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -28,7 +28,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateless.StatelessContainer;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -29,7 +29,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.wsf.container.jboss50.AbstractDeployerHook;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -27,18 +27,16 @@
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.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
+import org.jboss.wsf.spi.deployment.WebXMLRewriter;
/**
* Publish the HTTP service endpoint to Tomcat
@@ -51,11 +49,11 @@
// provide logging
private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
- private MainDeployer mainDeployer;
+ private DeployerClient mainDeployer;
private WebXMLRewriter webXMLRewriter;
- private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
+ private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>();
- public void setMainDeployer(MainDeployer mainDeployer)
+ public void setMainDeployer(DeployerClient mainDeployer)
{
this.mainDeployer = mainDeployer;
}
@@ -77,12 +75,11 @@
try
{
webXMLRewriter.rewriteWebXml(dep);
- DeploymentContext context = createDeploymentContext(warURL);
+ org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(warURL);
- mainDeployer.addDeploymentContext(context);
- mainDeployer.process();
+ mainDeployer.deploy(deployment);
- contextMap.put(warURL.toExternalForm(), context);
+ deploymentMap.put(warURL.toExternalForm(), deployment);
}
catch (Exception ex)
{
@@ -106,14 +103,11 @@
log.debug("destroyServiceEndpoint: " + warURL);
try
{
- DeploymentContext context = contextMap.get(warURL.toExternalForm());
- if (context != null)
+ org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm());
+ if (deployment != null)
{
- context.setState(DeploymentState.UNDEPLOYING);
- mainDeployer.process();
- mainDeployer.removeDeploymentContext(context.getName());
-
- contextMap.remove(warURL.toExternalForm());
+ mainDeployer.undeploy(deployment);
+ deploymentMap.remove(warURL.toExternalForm());
}
}
catch (Exception ex)
@@ -122,9 +116,9 @@
}
}
- private DeploymentContext createDeploymentContext(URL warURL) throws Exception
+ private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception
{
VirtualFile file = VFS.getRoot(warURL);
- return new AbstractDeploymentContext(file);
+ return VFSDeploymentFactory.getInstance().createVFSDeployment(file);
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-06-29 12:57:03 UTC (rev 3762)
@@ -8,16 +8,6 @@
<bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB">
<property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property>
<property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>EJB2xDeployer</depends>
<depends>EJBRegistrationDeployer</depends>
</bean>
@@ -27,16 +17,6 @@
-->
<bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE">
<property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>WebAppParsingDeployer</depends>
</bean>
@@ -46,16 +26,6 @@
<bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer">
<property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property>
<property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>WarDeployer</depends>
<depends>WebServiceDeployerEJB</depends>
<depends>WebServiceDeployerJSE</depends>
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -30,7 +30,6 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.jboss.logging.Logger;
@@ -68,21 +67,21 @@
}
/** True, if -Djbossws.integration.target=jboss50 */
- public static boolean isTargetJBoss50()
+ public boolean isTargetJBoss50()
{
String target = getIntegrationTarget();
return "jboss50".equals(target);
}
/** True, if -Djbossws.integration.target=jboss42 */
- public static boolean isTargetJBoss42()
+ public boolean isTargetJBoss42()
{
String target = getIntegrationTarget();
return "jboss42".equals(target);
}
/** True, if -Djbossws.integration.target=jboss40 */
- public static boolean isTargetJBoss40()
+ public boolean isTargetJBoss40()
{
String target = getIntegrationTarget();
return "jboss40".equals(target);
@@ -93,18 +92,18 @@
String vendor = Service.class.getPackage().getImplementationVendor();
return vendor.startsWith("JBoss");
}
-
+
public boolean isIntegrationSunRI()
{
String vendor = Service.class.getPackage().getImplementationVendor();
return vendor.startsWith("Sun Microsystems");
}
-
+
public boolean isIntegrationXFire()
{
throw new NotImplementedException();
}
-
+
/**
* Get the JBoss server host from system property "jboss.bind.address"
* This defaults to "localhost"
@@ -139,7 +138,7 @@
return new TestDeployerJBoss(getServer());
}
- private static String getIntegrationTarget()
+ public String getIntegrationTarget()
{
if (integrationTarget == null)
{
@@ -149,10 +148,11 @@
throw new IllegalStateException("Cannot obtain jbossws.integration.target");
// Read the JBoss SpecificationVersion
+ String jbossVersion = null;
try
{
ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
@@ -160,17 +160,14 @@
else if (jbossVersion.startsWith("4.0"))
jbossVersion = "jboss40";
else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
- if (jbossVersion.equals(integrationTarget) == false)
- {
- throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
- //integrationTarget = jbossVersion;
- }
}
catch (Throwable th)
{
// ignore, we are not running on jboss-4.2 or greater
}
+
+ if (jbossVersion != null && jbossVersion.equals(integrationTarget) == false)
+ throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
}
return integrationTarget;
}
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -30,6 +30,8 @@
import javax.management.MBeanServerConnection;
import javax.naming.NamingException;
+import org.jboss.logging.Logger;
+
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -42,6 +44,9 @@
*/
public class JBossWSTestSetup extends TestSetup
{
+ // provide logging
+ private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
+
private JBossWSTestHelper delegate = new JBossWSTestHelper();
private String[] archives = new String[0];
@@ -76,6 +81,10 @@
protected void setUp() throws Exception
{
+ // verify integration target
+ String integrationTarget = delegate.getIntegrationTarget();
+ log.debug("Integration target: " + integrationTarget);
+
List clientJars = new ArrayList();
for (int i = 0; i < archives.length; i++)
{
Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -48,7 +48,7 @@
{
public static Test suite()
{
- String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
+ String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
return new JBossWSTestSetup(EarTestCase.class, earName);
}
16 years, 9 months
- 1
- 0