JBossWS SVN: r1466 - branches/tdiesler
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-19 16:46:26 -0500 (Sun, 19 Nov 2006)
New Revision: 1466
Removed:
branches/tdiesler/trunk/
Log:
recreate userbranch
18 years, 1 month
JBossWS SVN: r1465 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-19 07:42:26 -0500 (Sun, 19 Nov 2006)
New Revision: 1465
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java
Log:
layout code
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2006-11-19 12:41:46 UTC (rev 1464)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2006-11-19 12:42:26 UTC (rev 1465)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxrpc.samples.mtom;
import java.io.IOException;
@@ -42,8 +42,8 @@
*/
public class EmployeeRecordsImpl implements EmployeeRecords
{
- public Status updateEmployee(Employee employee) throws RemoteException {
-
+ public Status updateEmployee(Employee employee) throws RemoteException
+ {
try
{
DataHandler dataHandler = employee.getLegacyData();
@@ -54,12 +54,12 @@
// In that case you might receive an inlined request for
// an MTOM capable endpoint. The example below shows how deal with it.
- if("text/xml".equals(contentType))
+ if ("text/xml".equals(contentType))
{
StreamSource xmlStream = (StreamSource)dataHandler.getContent();
IOUtils.copyStream(System.out, xmlStream.getInputStream());
}
- else if("application/octet-stream".equals(contentType))
+ else if ("application/octet-stream".equals(contentType))
{
IOUtils.copyStream(System.out, dataHandler.getInputStream());
}
@@ -72,11 +72,12 @@
}
}
- public Employee queryEmployee(Query query) throws RemoteException {
+ public Employee queryEmployee(Query query) throws RemoteException
+ {
Employee employee = new Employee();
employee.setFirstname("Peter");
employee.setLastname("Pan");
- employee.setLegacyData( getLegacyData() );
+ employee.setLegacyData(getLegacyData());
return employee;
}
@@ -85,12 +86,7 @@
{
try
{
- return new DataHandler(
- new StreamSource(
- new ByteArrayInputStream("<Payroll><Data/></Payroll>".getBytes())
- ),
- "application/xml"
- );
+ return new DataHandler(new StreamSource(new ByteArrayInputStream("<Payroll><Data/></Payroll>".getBytes())), "application/xml");
}
catch (Exception e)
{
18 years, 1 month
JBossWS SVN: r1464 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-19 07:41:46 -0500 (Sun, 19 Nov 2006)
New Revision: 1464
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
Log:
layout code
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-11-17 23:36:09 UTC (rev 1463)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-11-19 12:41:46 UTC (rev 1464)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxrpc.samples.mtom;
import java.io.BufferedReader;
@@ -89,7 +89,7 @@
Employee employee = new Employee();
employee.setFirstname("Peter");
employee.setLastname("Pan");
- employee.setLegacyData( getLegacyData() );
+ employee.setLegacyData(getLegacyData());
Status status = port.updateEmployee(employee);
assertEquals("OK", status.getCode());
@@ -110,29 +110,16 @@
StreamSource xmlStream = (StreamSource)employee.getLegacyData().getContent();
String content = new BufferedReader(new InputStreamReader(xmlStream.getInputStream())).readLine();
- assertEquals("<Payroll><Data/></Payroll>", content);
+ assertEquals("<Payroll><Data/></Payroll>", content);
}
private DataHandler getLegacyData()
{
- try
- {
- return new DataHandler(
- new StreamSource(
- new ByteArrayInputStream("<Payroll><Data/></Payroll>".getBytes())
- ),
- "application/xml"
- );
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ return new DataHandler(new StreamSource(new ByteArrayInputStream("<Payroll><Data/></Payroll>".getBytes())), "application/xml");
}
private void setMTOMEnabled(Boolean b)
{
((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, b);
}
-
}
18 years, 1 month
JBossWS SVN: r1463 - tags
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-11-17 18:36:09 -0500 (Fri, 17 Nov 2006)
New Revision: 1463
Added:
tags/jbossws-2.0.0.CR2/
Log:
Tag 2.0.0.CR2
Copied: tags/jbossws-2.0.0.CR2 (from rev 1462, trunk)
18 years, 1 month
JBossWS SVN: r1462 - in trunk/src/test: . java/org/jboss/test/ws/jaxws/samples/retail java/org/jboss/test/ws/jaxws/samples/retail/cc java/org/jboss/test/ws/jaxws/samples/retail/profile java/org/jboss/test/ws/jaxws/samples/wsaddressing resources/jaxws/samples/retail/META-INF/wsdl
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-11-17 18:12:47 -0500 (Fri, 17 Nov 2006)
New Revision: 1462
Modified:
trunk/src/test/build.xml
trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java
trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java
trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java
trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java
trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl
trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl
trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl
Log:
Fix regression
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/build.xml 2006-11-17 23:12:47 UTC (rev 1462)
@@ -155,6 +155,7 @@
<pathelement location="${jboss.client}/${jbossws.client.jar}"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
</path>
<!-- The combined compile classpath -->
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2006-11-17 23:12:47 UTC (rev 1462)
@@ -49,10 +49,12 @@
private static final Logger log = Logger.getLogger(OrderMgmtBean.class);
- @WebServiceRef private CCVerificationService verificationService;
+ @WebServiceRef(wsdlLocation="META-INF/wsdl/CCVerificationService.wsdl")
+ private CCVerificationService verificationService;
private CCVerification verificationPort;
- @WebServiceRef private ProfileMgmtService profileService;
+ @WebServiceRef(wsdlLocation="META-INF/wsdl/ProfileMgmtService.wsdl")
+ private ProfileMgmtService profileService;
private ProfileMgmt profilePort;
@PostConstruct public void initialize(){
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java 2006-11-17 23:12:47 UTC (rev 1462)
@@ -12,7 +12,7 @@
* This class was generated by the JAXWS SI.
* JAX-WS RI 2.1-10/21/2006 12:56 AM(vivek)-EA2
* Generated source version: 2.0
- *
+ *
*/
@WebServiceClient(name = "CCVerificationService", targetNamespace = "http://org.jboss.ws/samples/retail/cc", wsdlLocation = "resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl")
public class CCVerificationService
@@ -24,7 +24,7 @@
static {
URL url = null;
try {
- url = new URL("file:/C:/dev/prj/jbossws/trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl");
+ url = new URL("http://localhost:8080/jaxws-samples-retail/CCVerificationBean?wsdl");
} catch (MalformedURLException e) {
e.printStackTrace();
}
@@ -40,7 +40,7 @@
}
/**
- *
+ *
* @return
* returns CCVerification
*/
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java 2006-11-17 23:12:47 UTC (rev 1462)
@@ -13,7 +13,7 @@
* This class was generated by the JAXWS SI.
* JAX-WS RI 2.1-10/21/2006 12:56 AM(vivek)-EA2
* Generated source version: 2.0
- *
+ *
*/
@WebServiceClient(name = "ProfileMgmtService", targetNamespace = "http://org.jboss.ws/samples/retail/profile", wsdlLocation = "resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl")
public class ProfileMgmtService
@@ -25,7 +25,7 @@
static {
URL url = null;
try {
- url = new URL("file:/C:/dev/prj/jbossws/trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl");
+ url = new URL("http://localhost:8080/jaxws-samples-retail/ProfileMgmtBean?wsdl");
} catch (MalformedURLException e) {
e.printStackTrace();
}
@@ -41,7 +41,7 @@
}
/**
- *
+ *
* @return
* returns ProfileMgmt
*/
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2006-11-17 23:12:47 UTC (rev 1462)
@@ -44,6 +44,7 @@
*/
@WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
+@PortComponent(configName = "Standard WSAddressing Endpoint")
public interface StatefulEndpoint extends Remote
{
@WebMethod
Modified: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl
===================================================================
--- trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl 2006-11-17 23:12:47 UTC (rev 1462)
@@ -41,7 +41,7 @@
</binding>
<service name="CCVerificationService">
<port binding="tns:CCVerificationBinding" name="CCVerificationPort">
- <soap:address location="http://D1XC662J:8080/jaxws-samples-retail/CCVerificationBean"/>
+ <soap:address location="http://@jbosstest.host.name@:8080/jaxws-samples-retail/CCVerificationBean"/>
</port>
</service>
-</definitions>
\ No newline at end of file
+</definitions>
Modified: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl
===================================================================
--- trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl 2006-11-17 23:12:47 UTC (rev 1462)
@@ -59,7 +59,7 @@
</binding>
<service name="OrderMgmtService">
<port binding="tns:OrderMgmtBinding" name="OrderMgmtPort">
- <soap:address location="http://D1XC662J:8080/jaxws-samples-retail/OrderMgmtBean"/>
+ <soap:address location="http://@jbosstest.host.name@:8080/jaxws-samples-retail/OrderMgmtBean"/>
</port>
</service>
-</definitions>
\ No newline at end of file
+</definitions>
Modified: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl
===================================================================
--- trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2006-11-17 23:10:01 UTC (rev 1461)
+++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2006-11-17 23:12:47 UTC (rev 1462)
@@ -61,7 +61,7 @@
<service name='ProfileMgmtService'>
<port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'>
- <soap:address location='http://D1XC662J:8080/jaxws-samples-retail/ProfileMgmtBean'/>
+ <soap:address location='http://@jbosstest.host.name@:8080/jaxws-samples-retail/ProfileMgmtBean'/>
</port>
</service>
-</definitions>
\ No newline at end of file
+</definitions>
18 years, 1 month
JBossWS SVN: r1461 - trunk/src/main/java/org/jboss/ws/integration/jboss50
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-11-17 18:10:01 -0500 (Fri, 17 Nov 2006)
New Revision: 1461
Modified:
trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java
Log:
Prevent JAX-RPC JSE deployer from applying to EJB deployments
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-11-17 16:50:33 UTC (rev 1460)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-11-17 23:10:01 UTC (rev 1461)
@@ -24,8 +24,10 @@
//$Id$
import java.net.URL;
+import java.util.Set;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.metadata.WebMetaData;
import org.jboss.virtual.VirtualFile;
import org.jboss.ws.deployment.JSR109Deployment;
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
@@ -48,8 +50,8 @@
@Override
public boolean isWebServiceDeployment(DeploymentUnit unit)
{
- URL wsURL = getWebServicesURL(unit);
- return wsURL != null;
+ Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class);
+ return allMetaData.size() > 0 && getWebServicesURL(unit) != null;
}
@Override
18 years, 1 month
JBossWS SVN: r1460 - in trunk/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss50 test/ant test/java/org/jboss/test/ws/jaxws test/java/org/jboss/test/ws/jaxws/jbws1357 test/resources/jaxws test/resources/jaxws/jbws1357 test/resources/jaxws/jbws1357/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-11-17 11:50:33 -0500 (Fri, 17 Nov 2006)
New Revision: 1460
Added:
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
trunk/src/test/resources/jaxws/jbws1357/
trunk/src/test/resources/jaxws/jbws1357/WEB-INF/
trunk/src/test/resources/jaxws/jbws1357/WEB-INF/web.xml
trunk/src/test/resources/jaxws/jbws1357/hello.jsp
Modified:
trunk/src/main/java/org/jboss/ws/deployment/AbstractServiceEndpointPublisher.java
trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java
trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java
trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java
trunk/src/test/ant/build-jars-jaxws.xml
Log:
Fix JBWS-1347
Modified: trunk/src/main/java/org/jboss/ws/deployment/AbstractServiceEndpointPublisher.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/AbstractServiceEndpointPublisher.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/main/java/org/jboss/ws/deployment/AbstractServiceEndpointPublisher.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -141,8 +141,10 @@
// find the servlet-class
Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class");
+
+ // JSP
if (classElement == null)
- throw new WSException("Cannot find <servlet-class> for servlet-name: " + linkName);
+ continue;
// Get the servlet class
String servletClassName = DOMUtils.getTextContent(classElement);
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -120,6 +120,11 @@
{
Servlet servlet = (Servlet)it.next();
String className = servlet.getServletClass();
+
+ // JSP
+ if (className == null || className.length() == 0)
+ continue;
+
Class<?> servletClass = anLoader.loadClass(className);
if (servletClass.isAnnotationPresent(WebService.class))
{
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -70,7 +70,7 @@
{
Servlet servlet = (Servlet)it.next();
// Skip JSPs
- if (servlet.getJspFile() != null && servlet.getJspFile().length() > 0)
+ if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0)
continue;
String beanName = servlet.getServletClass();
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -39,7 +39,7 @@
import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
/**
- * Build container independent web meta data
+ * Build container independent web meta data
*
* @author Thomas.Diesler(a)jboss.org
* @since 05-May-2006
@@ -98,7 +98,7 @@
}
return mappings;
}
-
+
private static Map<String, String> getServletClassMap(WebMetaData wmd)
{
Map<String, String> mappings = new HashMap<String, String>();
@@ -106,6 +106,10 @@
while(it.hasNext())
{
Servlet servlet = (Servlet)it.next();
+ // Skip JSPs
+ if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0)
+ continue;
+
mappings.put(servlet.getName(), servlet.getServletClass());
}
return mappings;
Modified: trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-17 16:50:33 UTC (rev 1460)
@@ -576,7 +576,17 @@
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
</classes>
</war>
-
+
+ <!-- jaxws-jbws1357 -->
+ <war warfile="${build.test.dir}/libs/jaxws-jbws1357.war" webxml="${build.test.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
+ </classes>
+ <fileset dir="${build.test.dir}/resources/jaxws/jbws1357">
+ <include name="hello.jsp"/>
+ </fileset>
+ </war>
</target>
</project>
Added: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -0,0 +1,29 @@
+/*
+ * 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.jbws1357;
+import javax.jws.WebService;
+
+@WebService
+public interface JBWS1357
+{
+ public String echo(String message);
+}
\ No newline at end of file
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -0,0 +1,33 @@
+/*
+ * 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.jbws1357;
+
+import javax.jws.WebService;
+
+@WebService(endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357")
+public class JBWS1357Impl implements JBWS1357
+{
+ public String echo(String message)
+ {
+ return message;
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2006-11-17 16:50:33 UTC (rev 1460)
@@ -0,0 +1,74 @@
+/*
+ * 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.jbws1357;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Test JBWS-1357 (jsps in deployment)
+ *
+ * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
+ * @version $Revision:1370 $
+ */
+public class JBWS1357TestCase extends JBossWSTest
+{
+ private String targetNS = "http://jbws1357.jaxws.ws.test.jboss.org/";
+ private JBWS1357 proxy;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1357TestCase.class, "jaxws-jbws1357.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "JBWS1357Service");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/JBWS1357Service?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (JBWS1357)service.getPort(JBWS1357.class);
+ }
+
+ public void testEcho() throws Exception
+ {
+ assertEquals("hi there", proxy.echo("hi there"));
+ }
+
+ public void testJSP() throws Exception
+ {
+ URL jsp = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/hello.jsp");
+ HttpURLConnection conn = (HttpURLConnection) jsp.openConnection();
+ assertEquals(conn.getResponseCode(), 200);
+ }
+}
\ No newline at end of file
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxws/jbws1357/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jaxws/jbws1357/WEB-INF/web.xml 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/test/resources/jaxws/jbws1357/WEB-INF/web.xml 2006-11-17 16:50:33 UTC (rev 1460)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>JBWS1357Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1357.JBWS1357Impl</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>hello_jsp</servlet-name>
+ <jsp-file>/hello.jsp</jsp-file>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBWS1357Service</servlet-name>
+ <url-pattern>/JBWS1357Service</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>hello_jsp</servlet-name>
+ <url-pattern>/hello.jsp</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: trunk/src/test/resources/jaxws/jbws1357/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxws/jbws1357/hello.jsp
===================================================================
--- trunk/src/test/resources/jaxws/jbws1357/hello.jsp 2006-11-17 14:39:40 UTC (rev 1459)
+++ trunk/src/test/resources/jaxws/jbws1357/hello.jsp 2006-11-17 16:50:33 UTC (rev 1460)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<% System.out.println("Hello"); %>
+</body>
+</html>
18 years, 1 month
JBossWS SVN: r1459 - in trunk/src: main/java/org/jboss/ws/integration/jboss50 test
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-11-17 09:39:40 -0500 (Fri, 17 Nov 2006)
New Revision: 1459
Modified:
trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java
trunk/src/test/build.xml
Log:
Fix JBWS-1357
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-17 11:34:36 UTC (rev 1458)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-17 14:39:40 UTC (rev 1459)
@@ -69,6 +69,10 @@
while (it.hasNext())
{
Servlet servlet = (Servlet)it.next();
+ // Skip JSPs
+ if (servlet.getJspFile() != null && servlet.getJspFile().length() > 0)
+ continue;
+
String beanName = servlet.getServletClass();
Class<?> servletClass = anLoader.loadClass(beanName);
if (servletClass.isAnnotationPresent(WebService.class))
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-11-17 11:34:36 UTC (rev 1458)
+++ trunk/src/test/build.xml 2006-11-17 14:39:40 UTC (rev 1459)
@@ -151,6 +151,7 @@
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-log4j.jar"/>
<pathelement location="${jboss.client}/${jbossws.client.jar}"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
18 years, 1 month
JBossWS SVN: r1458 - in trunk: . src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/integration src/main/java/org/jboss/ws/integration/jboss50 src/main/java/org/jboss/ws/server src/main/resources/jbossws.beans/META-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-17 06:34:36 -0500 (Fri, 17 Nov 2006)
New Revision: 1458
Added:
trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java
Removed:
trunk/src/main/java/org/jboss/ws/integration/jboss/
trunk/src/main/java/org/jboss/ws/integration/jboss40/
Modified:
trunk/.classpath
trunk/build.xml
trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java
trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java
trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
Log:
remove stale jboss40 integration
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2006-11-17 09:41:56 UTC (rev 1457)
+++ trunk/.classpath 2006-11-17 11:34:36 UTC (rev 1458)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/ws/integration/jboss40/" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/test/java"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/mailapi.jar"/>
@@ -23,12 +23,12 @@
<classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
- <classpathentry sourcepath="/home/tdiesler/svn/jbossmc/trunk/container/src/main" kind="lib" path="thirdparty/jboss-container.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-container.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/container/src/main"/>
<classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main" kind="lib" path="thirdparty/jboss-deployers.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main"/>
<classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-11-17 09:41:56 UTC (rev 1457)
+++ trunk/build.xml 2006-11-17 11:34:36 UTC (rev 1458)
@@ -158,8 +158,6 @@
<javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
- <!-- Exclude JBoss40 deployer interceptors -->
- <exclude name="org/jboss/ws/integration/jboss40/**"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
@@ -246,7 +244,6 @@
<jar jarfile="${build.lib.dir}/jbossws-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/integration/*.class"/>
- <include name="org/jboss/ws/integration/jboss/**"/>
<include name="org/jboss/ws/integration/jboss50/**"/>
</fileset>
</jar>
@@ -263,7 +260,7 @@
<fileset dir="${build.classes.dir}">
<include name="javax/**"/>
<include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/jboss/**"/>
+ <exclude name="org/jboss/ws/integration/jboss50/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-17 09:41:56 UTC (rev 1457)
+++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-17 11:34:36 UTC (rev 1458)
@@ -40,7 +40,10 @@
* The POJO deployer for web service endpoints. This Deployer is already decoupled from the target
* container (i.e. JBoss, Tomcat). The containers deployer architecture should be used to populate
* the UnifiedDeploymentInfo object.
- *
+ *
+ * @deprecated
+ * This functionality should be handled by the ServiceEndpointManager
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 12-May-2006
*/
Copied: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java (from rev 1457, trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java)
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java 2006-11-17 09:41:56 UTC (rev 1457)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java 2006-11-17 11:34:36 UTC (rev 1458)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss50;
+
+//$Id$
+
+import java.io.File;
+
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.ws.server.ServerConfig;
+import org.jboss.ws.utils.ObjectNameFactory;
+
+/**
+ * JBoss specific implementation of a ServerConfig
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-May-2006
+ */
+public class ServerConfigImpl implements ServerConfig
+{
+ public File getServerTempDir()
+ {
+ try
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File tmpdir = (File)server.getAttribute(oname, "ServerTempDir");
+ return tmpdir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getServerDataDir()
+ {
+ try
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File tmpdir = (File)server.getAttribute(oname, "ServerDataDir");
+ return tmpdir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+}
Property changes on: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java 2006-11-17 09:41:56 UTC (rev 1457)
+++ trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java 2006-11-17 11:34:36 UTC (rev 1458)
@@ -36,9 +36,7 @@
import javax.xml.rpc.JAXRPCException;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ServletEndpointContextImpl;
import org.jboss.ws.metadata.ServerEndpointMetaData;
import org.jboss.ws.utils.ObjectNameFactory;
Modified: trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-17 09:41:56 UTC (rev 1457)
+++ trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-17 11:34:36 UTC (rev 1458)
@@ -19,9 +19,11 @@
<property name="alwaysModifySOAPAddress">true</property>
<property name="serviceEndpointInvokerJSE">org.jboss.ws.server.ServiceEndpointInvokerJSE</property>
- <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB21</property>
<property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB3</property>
- <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss.ServiceEndpointInvokerMDB</property>
+ <!-- Not implemented
+ <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB21</property>
+ <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerMDB</property>
+ -->
</bean>
<bean name="ServiceEndpointDeployer" class="org.jboss.ws.deployment.ServiceEndpointDeployer">
@@ -32,7 +34,7 @@
<bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss50.ServiceEndpointPublisher">
<property name="mainDeployer"><inject bean="MainDeployer"/></property>
- <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss.ServiceEndpointServlet</property>
+ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss50.JBossServiceEndpointServlet</property>
</bean>
<!-- Bind JAXRPC Service objects in application client environment context -->
@@ -41,7 +43,7 @@
<!-- A subscription manager for WS-Eventing -->
<bean name="SubscriptionManager" class="org.jboss.ws.eventing.mgmt.SubscriptionManager"/>
- <bean name="ServerConfig" class="org.jboss.ws.integration.jboss.ServerConfigImpl"/>
+ <bean name="ServerConfig" class="org.jboss.ws.integration.jboss50.ServerConfigImpl"/>
<bean name="KernelLocator" class="org.jboss.ws.server.KernelLocator">
<!--property name="kernel">
18 years, 1 month
JBossWS SVN: r1457 - branches/jbossws-1.0
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-17 04:41:56 -0500 (Fri, 17 Nov 2006)
New Revision: 1457
Removed:
branches/jbossws-1.0/jbossws-1.0/
Log:
delete erroneous import
18 years, 1 month