JBossWS SVN: r14764 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 06:17:40 -0400 (Thu, 28 Jul 2011)
New Revision: 14764
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
refactoring injection test to shared test suite
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-07-28 10:09:12 UTC (rev 14763)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-07-28 10:17:40 UTC (rev 14764)
@@ -59,20 +59,6 @@
</fileset>
</jar>
- <!-- jaxws-enventry -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/jse-web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.class" />
- <include name="org/jboss/test/ws/jaxws/enventry/ServerSideHandler.class" />
- <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.class" />
- </classes>
- </war>
- <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/servlet-web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.class" />
- </classes>
- </war>
-
<!-- jaxws-epr -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar">
<fileset dir="${tests.output.dir}/test-classes">
12 years, 9 months
JBossWS SVN: r14763 - in stack/native/trunk/modules/testsuite/native-tests/src/test: resources/jaxws/enventry/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 06:09:12 -0400 (Thu, 28 Jul 2011)
New Revision: 14763
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
Log:
removing useless/unused test handlers
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java 2011-07-28 09:58:48 UTC (rev 14762)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java 2011-07-28 10:09:12 UTC (rev 14763)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.enventry;
-
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class ClientSideHandler extends EnvEntryHandler
-{
- public InitialContext getInitialContext() throws NamingException
- {
- Properties env = new Properties();
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099");
- env.setProperty("j2ee.clientName", "jbossws-client");
- return new InitialContext(env);
- }
-}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java 2011-07-28 09:58:48 UTC (rev 14762)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java 2011-07-28 10:09:12 UTC (rev 14763)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.enventry;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-
-abstract public class EnvEntryHandler extends GenericHandler
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EnvEntryHandler.class);
-
- private QName[] headers = new QName[]{};
-
- public QName[] getHeaders()
- {
- return headers;
- }
-
- public boolean handleRequest(MessageContext msgContext)
- {
- String value = handleRequestAndResponse(msgContext);
- log.info("handleRequest: " + value);
- return true;
- }
-
- public boolean handleResponse(MessageContext msgContext)
- {
- String value = handleRequestAndResponse(msgContext);
- log.info("handleResponse: " + value);
- return true;
- }
-
- private String handleRequestAndResponse(MessageContext msgContext)
- {
- String value = null;
- try
- {
- SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- SOAPBody soapBody = soapMessage.getSOAPBody();
-
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
- SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next();
- value = soapElement.getValue();
-
- InitialContext ic = getInitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jaxws/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jaxws/entry2");
-
- value = value + ":" + getHandlerName() + ":" + strValue + ":" + intValue;
- soapElement.setValue(value);
- }
- catch (Exception e)
- {
- throw new JAXRPCException(e);
- }
-
- return value;
- }
-
- private String getHandlerName()
- {
- String handlerName = getClass().getName();
- return handlerName.substring(handlerName.lastIndexOf(".") + 1);
- }
-
- abstract public InitialContext getInitialContext() throws NamingException;
-
- /**
- * Get the JBoss server host from system property "jboss.bind.address"
- * This defaults to "" + getServerHost() + ""
- */
- public String getServerHost()
- {
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- return hostName;
- }
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 09:58:48 UTC (rev 14762)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 10:09:12 UTC (rev 14763)
@@ -39,7 +39,6 @@
*/
public class EnvEntryJSETestCase extends JBossWSTest
{
-
public static Test suite()
{
return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry-jse.war");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2011-07-28 09:58:48 UTC (rev 14762)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2011-07-28 10:09:12 UTC (rev 14763)
@@ -38,7 +38,6 @@
*/
public class EnvEntryServletTestCase extends JBossWSTest
{
-
public static Test suite()
{
return new JBossWSTestSetup(EnvEntryServletTestCase.class, "jaxws-enventry-servlet.war");
@@ -49,7 +48,7 @@
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet");
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
String line = br.readLine();
-
+
assertEquals("web:8", line);
}
}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java 2011-07-28 09:58:48 UTC (rev 14762)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java 2011-07-28 10:09:12 UTC (rev 14763)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.enventry;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class ServerSideHandler extends EnvEntryHandler
-{
- public InitialContext getInitialContext() throws NamingException
- {
- return new InitialContext();
- }
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml 2011-07-28 09:58:48 UTC (rev 14762)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml 2011-07-28 10:09:12 UTC (rev 14763)
@@ -20,7 +20,7 @@
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>web</env-entry-value>
</env-entry>
-
+
<env-entry>
<env-entry-name>jaxws/entry2</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
@@ -28,4 +28,3 @@
</env-entry>
</web-app>
-
12 years, 9 months
JBossWS SVN: r14762 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 05:58:48 -0400 (Thu, 28 Jul 2011)
New Revision: 14762
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
Log:
enable test
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 07:51:09 UTC (rev 14761)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 09:58:48 UTC (rev 14762)
@@ -53,6 +53,6 @@
EnvEntryEndpoint port = service.getPort(EnvEntryEndpoint.class);
String res = port.helloEnvEntry("InitalMessage");
- //assertEquals("InitalMessage:endpoint:web:8", res);
+ assertEquals("InitalMessage:endpoint:web:8", res);
}
}
12 years, 9 months
JBossWS SVN: r14761 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 03:51:09 -0400 (Thu, 28 Jul 2011)
New Revision: 14761
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[AS7-1101][AS7-1125][JBWS-3322] enabling passing tests after JBoss metadata upgrade
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-28 07:34:46 UTC (rev 14760)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-28 07:51:09 UTC (rev 14761)
@@ -1036,7 +1036,7 @@
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- [AS7-1101][JBWS-3322] -->
+ <!-- [AS7-1101][JBWS-3322], fixed on AS 7.0.1 & above -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
@@ -1211,6 +1211,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
@@ -1223,11 +1224,6 @@
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- [AS7-1101][JBWS-3322] -->
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
-
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
12 years, 9 months
JBossWS SVN: r14760 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 03:34:46 -0400 (Thu, 28 Jul 2011)
New Revision: 14760
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[AS7-1101][AS7-1125] enabling passing tests after JBoss metadata upgrade
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-07-27 16:39:47 UTC (rev 14759)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-07-28 07:34:46 UTC (rev 14760)
@@ -821,7 +821,7 @@
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
+ <!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
@@ -973,6 +973,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
@@ -991,11 +992,6 @@
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
-
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
12 years, 9 months
JBossWS SVN: r14759 - stack/native/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-27 12:39:47 -0400 (Wed, 27 Jul 2011)
New Revision: 14759
Modified:
stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml
Log:
[JBWS-3326] Fixing projectGenerator test failure on AS 6
Modified: stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-27 16:14:26 UTC (rev 14758)
+++ stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-27 16:39:47 UTC (rev 14759)
@@ -23,8 +23,8 @@
<path id="jbws-ant.path">
<pathelement location="${jboss.client}/jbossws-common-tools.jar" />
- <fileset dir="${jboss.home}/modules">
- <include name="**/jbossws-common-tools*.jar"/>
+ <fileset dir="${jboss.home}">
+ <include name="modules/**/jbossws-common-tools*.jar"/>
</fileset>
</path>
<taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/>
12 years, 9 months
JBossWS SVN: r14758 - stack/native/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-27 12:14:26 -0400 (Wed, 27 Jul 2011)
New Revision: 14758
Modified:
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Adding jnp-client.jar to bindist testsuite classpath (AS7)
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-07-27 16:04:10 UTC (rev 14757)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-07-27 16:14:26 UTC (rev 14758)
@@ -112,6 +112,17 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.naming:jnp-client:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <scope>test</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<includes>
12 years, 9 months
JBossWS SVN: r14757 - stack/cxf/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-27 12:04:10 -0400 (Wed, 27 Jul 2011)
New Revision: 14757
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Adding jnp-client.jar to bindist testsuite classpath (AS7)
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-07-27 16:04:01 UTC (rev 14756)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-07-27 16:04:10 UTC (rev 14757)
@@ -114,6 +114,17 @@
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.naming:jnp-client:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <scope>test</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
12 years, 9 months
JBossWS SVN: r14756 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-27 12:04:01 -0400 (Wed, 27 Jul 2011)
New Revision: 14756
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Adding jnp-client.jar to bindist testsuite classpath
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-07-27 12:49:06 UTC (rev 14755)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-07-27 16:04:01 UTC (rev 14756)
@@ -235,6 +235,7 @@
<path id="integration.target.client.classpath">
<pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
<pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
+ <pathelement location="${thirdparty.dir}/jnp-client.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
<pathelement location="${jboss.home}/jboss-modules.jar"/>
<fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
12 years, 9 months
JBossWS SVN: r14755 - container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-27 08:49:06 -0400 (Wed, 27 Jul 2011)
New Revision: 14755
Modified:
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
Log:
[JBWS-3334] fixing injection method lookup algorithm
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-07-27 12:44:16 UTC (rev 14754)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-07-27 12:49:06 UTC (rev 14755)
@@ -243,7 +243,7 @@
{
// prepare injection target meta data
targetClass = resourceInjectionTargetMD.getInjectionTargetClass();
- targetName = resourceInjectionTargetMD.getInjectionTargetName();
+ targetName = getTargetName(resourceInjectionTargetMD);
// build injection meta data for injection target
final InjectionMetaData injectionMD = new InjectionMetaData(targetClass, targetName, envEntryValueClass,
@@ -256,4 +256,15 @@
return retVal;
}
+
+ private String getTargetName(final ResourceInjectionTargetMetaData resourceInjectionTargetMD)
+ {
+ final String targetName = resourceInjectionTargetMD.getInjectionTargetName();
+ if (targetName.startsWith("set"))
+ {
+ final String propertyName = targetName.substring(3);
+ return propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1);
+ }
+ return targetName;
+ }
}
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-07-27 12:44:16 UTC (rev 14754)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-07-27 12:49:06 UTC (rev 14755)
@@ -688,13 +688,28 @@
return field;
}
+ final String targetName = getMethodName(target);
for (Method method : clazz.getDeclaredMethods())
{
- if (method.getName().equals(target.getTargetName()))
+ if (method.getName().equals(targetName))
return method;
}
throw new RuntimeException(BundleUtils.getMessage(bundle, "INJECTION_TARGET_NOT_FOUND", target.getTargetClass()+ "." +target.getTargetName()));
+ }
+
+ private String getMethodName(final InjectionTarget target)
+ {
+ if (target.getTargetName() == null)
+ {
+ return null;
+ }
+ if (target.getTargetName().startsWith("set"))
+ {
+ return target.getTargetName();
+ }
+
+ return "set" + target.getTargetName().substring(0, 1).toUpperCase() + target.getTargetName().substring(1);
+ }
- }
}
12 years, 9 months