JBossWS SVN: r13720 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-10 09:14:01 -0500 (Thu, 10 Feb 2011)
New Revision: 13720
Added:
common/tags/jbossws-common-1.1.0.SP7/
Log:
Tagging jbossws-common 1.1.0.SP7
Copied: common/tags/jbossws-common-1.1.0.SP7 (from rev 13719, common/branches/jbossws-common-1.1.0)
13 years, 11 months
JBossWS SVN: r13718 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-10 09:07:01 -0500 (Thu, 10 Feb 2011)
New Revision: 13718
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3210] fixing AS7 tests endorsed directory to include all necessary artifacts
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-10 14:06:42 UTC (rev 13717)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-10 14:07:01 UTC (rev 13718)
@@ -55,6 +55,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>4.0.0.Alpha1</version><!-- TODO: think out how to remove this temporary hack -->
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -131,46 +136,39 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <!--execution>
- <id>unpack-shared-tests</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <type>zip</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/test</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution-->
- <execution>
- <id>create-endorsed-dir</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-endorsed-dir</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -740,7 +738,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss700.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
13 years, 11 months
JBossWS SVN: r13717 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-10 09:06:42 -0500 (Thu, 10 Feb 2011)
New Revision: 13717
Added:
spi/tags/jbossws-spi-1.1.2.SP6/
Log:
Tagging jbossws-spi-1.1.2.SP6
Copied: spi/tags/jbossws-spi-1.1.2.SP6 (from rev 13716, spi/branches/jbossws-spi-1.1.2)
13 years, 11 months
JBossWS SVN: r13716 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-10 06:20:31 -0500 (Thu, 10 Feb 2011)
New Revision: 13716
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
Log:
[JBAS-8838] Adding dependency on jaxb impl to apache cxf module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-02-10 09:57:54 UTC (rev 13715)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-02-10 11:20:31 UTC (rev 13716)
@@ -35,6 +35,7 @@
<module name="javax.mail.api" />
<module name="javax.servlet.api" />
<module name="javax.xml.bind.api" services="import"/>
+ <module name="com.sun.xml.bind" services="import"/>
<module name="javax.xml.soap.api" />
<module name="javax.xml.stream.api" />
<module name="javax.xml.ws.api" />
13 years, 11 months
JBossWS SVN: r13715 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-10 04:57:54 -0500 (Thu, 10 Feb 2011)
New Revision: 13715
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
ensure proper AS7 logs are propagated plus disabling http spider for AS7 for now
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-02-10 09:31:35 UTC (rev 13714)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-02-10 09:57:54 UTC (rev 13715)
@@ -36,8 +36,13 @@
}
copyJBossLogs() {
- cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log
- cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log
+ if [ -f $JBOSS_HOME/bin/run.sh ]; then
+ cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log
+ cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log
+ else
+ cp $JBOSS_HOME/standalone/log/boot.log $WORKSPACE/jboss-boot.log
+ cp $JBOSS_HOME/standalone/log/server.log $WORKSPACE/jboss-server.log
+ fi
}
copyTestLogs() {
@@ -46,17 +51,27 @@
}
removeJBossLogs() {
- rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log
- rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
+ if [ -f $JBOSS_HOME/bin/run.sh ]; then
+ rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log
+ rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
+ else
+ rm -f $JBOSS_HOME/standalone/log/boot.log
+ rm -f $JBOSS_HOME/standalone/log/server.log
+ fi
}
ensureRunningJBoss() {
- $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
- if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
- stopJBoss
- copyJBossLogs
- exit 1
+ if [ -f $JBOSS_HOME/bin/run.sh ]; then
+ $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
+ if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
+ stopJBoss
+ copyJBossLogs
+ exit 1
+ fi
+ else
+ echo "There's no admin console for AS7 yet"
+ sleep 20
fi
}
13 years, 11 months
JBossWS SVN: r13714 - in hudson/trunk: hudson-home and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-10 04:31:35 -0500 (Thu, 10 Feb 2011)
New Revision: 13714
Added:
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/scripts/jboss.sh
Log:
adding CXF AS7 core job
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-02-09 16:58:20 UTC (rev 13713)
+++ hudson/trunk/ant.properties.example 2011-02-10 09:31:35 UTC (rev 13714)
@@ -25,6 +25,10 @@
hudson.jboss600.build=jboss-6.0.0.Final
hudson.jboss600.rev=HEAD
+hudson.jboss700.url=https://github.com/jbossas/jboss-as
+hudson.jboss700.build=jboss-7.0.0.Alpha2
+hudson.jboss700.rev=master
+
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2011-02-09 16:58:20 UTC (rev 13713)
+++ hudson/trunk/hudson-home/config.xml 2011-02-10 09:31:35 UTC (rev 13714)
@@ -37,6 +37,7 @@
<tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
<tr><th align=left>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
+ <tr><th align=left>@hudson.jboss700.build@</th><td>-r(a)hudson.jboss700.rev@ @hudson.jboss700.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -109,6 +110,7 @@
<string>CXF-ALL</string>
<string>CXF-LIGHT</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
@@ -132,6 +134,7 @@
<no-comparator/>
<string>CXF-LIGHT</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
Modified: hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml 2011-02-09 16:58:20 UTC (rev 13713)
+++ hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml 2011-02-10 09:31:35 UTC (rev 13714)
@@ -23,14 +23,14 @@
<string>uploadpack</string>
<string>git-upload-pack</string>
<string>url</string>
- <string>https://github.com/jbossas/jboss-as.git</string>
+ <string>@hudson.jboss700.url@.git</string>
<string>tagopt</string>
<string></string>
</org.spearce.jgit.transport.RemoteConfig>
</remoteRepositories>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>master</name>
+ <name>@hudson.jboss700.rev@</name>
</hudson.plugins.git.BranchSpec>
</branches>
<localBranch></localBranch>
@@ -44,7 +44,7 @@
<buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
<gitTool>Default</gitTool>
<browser class="hudson.plugins.git.browser.GithubWeb">
- <url>https://github.com/jbossas/jboss-as/</url>
+ <url>@hudson.jboss700.url@</url>
</browser>
<submoduleCfg class="list"/>
<relativeTargetDir></relativeTargetDir>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-02-09 16:58:20 UTC (rev 13713)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-02-10 09:31:35 UTC (rev 13714)
@@ -8,6 +8,8 @@
, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-CORE-AS-7.0.0-SUN-JDK-6
+
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml 2011-02-10 09:31:35 UTC (rev 13714)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-7.0.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss700
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.0/workspace/build/target/(a)hudson.jboss700.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss700.build@ with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-02-09 16:58:20 UTC (rev 13713)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-02-10 09:31:35 UTC (rev 13714)
@@ -8,6 +8,8 @@
, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-CORE-AS-7.0.0-SUN-JDK-6
+
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
Modified: hudson/trunk/scripts/jboss.sh
===================================================================
--- hudson/trunk/scripts/jboss.sh 2011-02-09 16:58:20 UTC (rev 13713)
+++ hudson/trunk/scripts/jboss.sh 2011-02-10 09:31:35 UTC (rev 13714)
@@ -3,11 +3,20 @@
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
JBOSS_HOME="$1"
+CMD="$2"
BINDADDR="$3"
-CMD="$2"
export JBOSS_HOME
+PIDFILE="$JBOSS_HOME/bin/jboss.pid"
+if [ -f "$JBOSS_HOME/bin/run.sh" ]; then
+ RUN_CMD="$DIRNAME/runjboss.sh -b $BINDADDR"
+else
+ RUN_CMD="$JBOSS_HOME/bin/standalone.sh"
+ export LAUNCH_JBOSS_IN_BACKGROUND="true"
+ export JBOSS_PIDFILE=$PIDFILE
+fi
+
#
# Helper to complain.
#
@@ -15,22 +24,15 @@
echo "$PROGNAME: $*"
}
-if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then
- warn "Cannot find: $JBOSS_HOME/bin/run.sh"
- exit 1
-fi
-
case "$CMD" in
start)
# This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
# It relies on bash specific features
- # Do you want to hide jboss output?
- /bin/bash $DIRNAME/runjboss.sh -b $BINDADDR &
+ /bin/bash $RUN_CMD &
;;
stop)
- pidfile="$JBOSS_HOME/bin/jboss.pid"
- if [ -f "$pidfile" ]; then
- pid=`cat "$pidfile"`
+ if [ -f "$PIDFILE" ]; then
+ pid=`cat "$PIDFILE"`
echo "kill pid: $pid"
kill $pid
if [ "$?" -eq 0 ]; then
@@ -38,10 +40,9 @@
sleep 20
kill -9 $pid &> /dev/null
fi
- rm "$pidfile"
+ rm "$PIDFILE"
else
- warn "No pid found, using shutdown"
- $JBOSS_HOME/bin/shutdown.sh -S > /dev/null &
+ warn "No pid found!"
fi
;;
restart)
@@ -49,5 +50,6 @@
$0 start
;;
*)
- echo "usage: $0 jboss_instance (start|stop|restart|help)"
+ echo "usage: $0 JBOSS_HOME (start|stop|restart|help)"
esac
+
13 years, 11 months
JBossWS SVN: r13713 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-09 11:58:20 -0500 (Wed, 09 Feb 2011)
New Revision: 13713
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
Log:
[JBAS-8838] Adding dependency on javax.mail to apache cxf module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-02-09 16:54:35 UTC (rev 13712)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-02-09 16:58:20 UTC (rev 13713)
@@ -32,6 +32,7 @@
<module name="javax.api" />
<module name="javax.annotation.api" />
<module name="javax.jws.api" />
+ <module name="javax.mail.api" />
<module name="javax.servlet.api" />
<module name="javax.xml.bind.api" services="import"/>
<module name="javax.xml.soap.api" />
13 years, 11 months
JBossWS SVN: r13712 - framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2011-02-09 11:54:35 -0500 (Wed, 09 Feb 2011)
New Revision: 13712
Modified:
framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
Log:
[JBPAPP-4406] Incomplete CONFIDENTIAL transport-guarantee detection for POJO endpoint.
Modified: framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2011-02-09 15:50:11 UTC (rev 13711)
+++ framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2011-02-09 16:54:35 UTC (rev 13712)
@@ -101,7 +101,7 @@
{
for (String currentUrlPattern : currentCollection.getUrlPatterns())
{
- if (urlPattern.equals(currentUrlPattern) || "/*".equals(currentUrlPattern))
+ if (urlPattern.equals(currentUrlPattern) || (urlPattern + "/*").equals(currentUrlPattern) || "/*".equals(currentUrlPattern))
{
transportGuarantee = currentSecurity.getTransportGuarantee();
}
13 years, 11 months
JBossWS SVN: r13711 - common/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2011-02-09 10:50:11 -0500 (Wed, 09 Feb 2011)
New Revision: 13711
Modified:
common/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
Log:
[JBWS-3212] Incomplete CONFIDENTIAL transport-guarantee detection for POJO endpoint.
Modified: common/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2011-02-09 14:06:52 UTC (rev 13710)
+++ common/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2011-02-09 15:50:11 UTC (rev 13711)
@@ -136,7 +136,7 @@
{
for (String currentUrlPattern : currentCollection.getUrlPatterns())
{
- if (urlPattern.equals(currentUrlPattern) || "/*".equals(currentUrlPattern))
+ if (urlPattern.equals(currentUrlPattern) || (urlPattern + "/*").equals(currentUrlPattern) || "/*".equals(currentUrlPattern))
{
transportGuarantee = currentSecurity.getTransportGuarantee();
}
13 years, 11 months