JBossWS SVN: r8185 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/tools/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-18 11:37:48 -0400 (Thu, 18 Sep 2008)
New Revision: 8185
Modified:
stack/native/trunk/.classpath
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
[JBWS-2267] use EntityResolver first
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-09-18 11:41:10 UTC (rev 8184)
+++ stack/native/trunk/.classpath 2008-09-18 15:37:48 UTC (rev 8185)
@@ -13,6 +13,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-common"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-framework"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.0.CR2"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.0.GA"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2008-09-18 11:41:10 UTC (rev 8184)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2008-09-18 15:37:48 UTC (rev 8185)
@@ -76,6 +76,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.core.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.Extendable;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
@@ -113,6 +114,7 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
/**
* A helper that translates a WSDL-1.1 object graph into a WSDL-2.0 object graph.
@@ -128,6 +130,7 @@
private static final Logger log = Logger.getLogger(WSDL11Reader.class);
private WSDLDefinitions destWsdl;
+ private JBossWSEntityResolver entityResolver = new JBossWSEntityResolver();
// Maps wsdl message parts to their corresponding element names
private Map<String, QName> messagePartToElementMap = new HashMap<String, QName>();
@@ -583,7 +586,23 @@
schemaLocationsMap.put(namespace, currLoc);
// Recursively handle schema imports
- Element importedSchema = DOMUtils.parse(currLoc.openStream());
+ Element importedSchema = null;
+ String schema = currLoc.toString();
+ if (entityResolver.getEntityMap().containsKey(schema))
+ {
+ try
+ {
+ importedSchema = DOMUtils.parse(entityResolver.resolveEntity(schema, schema).getByteStream());
+ }
+ catch (SAXException se)
+ {
+ log.error(se.getMessage(), se);
+ }
+ }
+ if (importedSchema == null)
+ {
+ importedSchema = DOMUtils.parse(currLoc.openStream());
+ }
handleSchemaImports(importedSchema, currLoc);
}
}
16 years, 1 month
JBossWS SVN: r8184 - in stack/native/trunk: modules/core and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-18 07:41:10 -0400 (Thu, 18 Sep 2008)
New Revision: 8184
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch AS versions
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/modules/core/pom.xml 2008-09-18 11:41:10 UTC (rev 8184)
@@ -214,7 +214,7 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/modules/management/pom.xml 2008-09-18 11:41:10 UTC (rev 8184)
@@ -48,12 +48,12 @@
<!-- [JBWS-2263] -->
<!--dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<classifier>container</classifier>
<scope>runtime</scope>
</dependency>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-09-18 11:41:10 UTC (rev 8184)
@@ -406,7 +406,7 @@
<profile>
<id>jboss500</id>
<properties>
- <jboss.version>5.0.0.CR1</jboss.version>
+ <jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
@@ -435,11 +435,6 @@
<artifactId>jboss-javaee</artifactId>
<version>${jboss.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jboss-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -454,6 +449,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:41:10 UTC (rev 8184)
@@ -9,10 +9,6 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [JBWS-2194] Cannot get security domain declared through jboss.xml DD (fixed
-# starting from AS 5 trunk container integration, next release 5.0.0.CR2)
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
@@ -25,9 +21,3 @@
# [JBWS-2217] Fix BPEL samples before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk)
-org/jboss/test/ws/tools/enums/EnumTestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/pom.xml 2008-09-18 11:41:10 UTC (rev 8184)
@@ -57,8 +57,8 @@
<jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version>
<!-- JBWS-2263 -->
<!--
- <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version>
-->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -148,18 +148,18 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>container</classifier>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/profiles.xml.example 2008-09-18 11:41:10 UTC (rev 8184)
@@ -15,8 +15,8 @@
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
+ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
+ <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.home>
</properties>
</profile>
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:41:10 UTC (rev 8184)
@@ -127,10 +127,6 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
- <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
- <!-- wsconsume will fail with a LinkageError too -->
- <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/>
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:14:05 UTC (rev 8183)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:41:10 UTC (rev 8184)
@@ -113,7 +113,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR1:jar</include>
+ <include>*:jbossws-jboss500CR2:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -133,7 +133,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR1:jar:container</include>
+ <include>*:jbossws-jboss500CR2:jar:container</include>
</includes>
</dependencySet>
<dependencySet>
16 years, 1 month
JBossWS SVN: r8183 - in stack/cxf/trunk: modules/management and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-18 07:14:05 -0400 (Thu, 18 Sep 2008)
New Revision: 8183
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch AS versions
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/modules/management/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
@@ -48,12 +48,12 @@
<!-- [JBWS-2263] -->
<!--dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<classifier>container</classifier>
<scope>runtime</scope>
</dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
@@ -193,7 +193,7 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
@@ -372,7 +372,7 @@
<profile>
<id>jboss500</id>
<properties>
- <jboss.version>5.0.0.CR1</jboss.version>
+ <jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
@@ -382,16 +382,6 @@
<version>${jboss.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
@@ -401,11 +391,6 @@
<artifactId>jboss-javaee</artifactId>
<version>${jboss.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jboss-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -420,6 +405,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:14:05 UTC (rev 8183)
@@ -102,16 +102,9 @@
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
-# [JBWS-2194] Cannot get security domain declared through jboss.xml DD (fixed
-# # starting from AS 5 trunk container integration, next release 5.0.0.CR2)
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
# [JBWS-2223] wsconsume for cxf build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/pom.xml 2008-09-18 11:14:05 UTC (rev 8183)
@@ -52,8 +52,8 @@
<jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version>
<!-- JBWS-2263 -->
<!--
- <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version>
-->
<cxf.version>2.1</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
@@ -136,18 +136,18 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>container</classifier>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/profiles.xml.example 2008-09-18 11:14:05 UTC (rev 8183)
@@ -14,8 +14,8 @@
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
+ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
+ <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.home>
</properties>
</profile>
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:14:05 UTC (rev 8183)
@@ -127,8 +127,6 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
- <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:02:33 UTC (rev 8182)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:14:05 UTC (rev 8183)
@@ -100,7 +100,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR1:jar</include>
+ <include>*:jbossws-jboss500CR2:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -120,7 +120,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR1:jar:container</include>
+ <include>*:jbossws-jboss500CR2:jar:container</include>
</includes>
</dependencySet>
<dependencySet>
16 years, 1 month
JBossWS SVN: r8182 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-18 07:02:33 -0400 (Thu, 18 Sep 2008)
New Revision: 8182
Modified:
stack/metro/trunk/pom.xml
Log:
update comments
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-09-18 10:54:45 UTC (rev 8181)
+++ stack/metro/trunk/pom.xml 2008-09-18 11:02:33 UTC (rev 8182)
@@ -53,8 +53,8 @@
<jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version>
<!-- JBWS-2263 -->
<!--
- <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version>
-->
<jboss.common.version>1.2.1.GA</jboss.common.version>
<commons.logging.version>1.1.1</commons.logging.version>
16 years, 1 month
JBossWS SVN: r8181 - in stack/metro/trunk: modules/management and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-18 06:54:45 -0400 (Thu, 18 Sep 2008)
New Revision: 8181
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch AS versions
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/modules/management/pom.xml 2008-09-18 10:54:45 UTC (rev 8181)
@@ -48,12 +48,12 @@
<!-- [JBWS-2263]
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<classifier>container</classifier>
<scope>runtime</scope>
</dependency>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/modules/server/pom.xml 2008-09-18 10:54:45 UTC (rev 8181)
@@ -186,7 +186,7 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-09-18 10:54:45 UTC (rev 8181)
@@ -427,7 +427,7 @@
<profile>
<id>jboss500</id>
<properties>
- <jboss.version>5.0.0.CR1</jboss.version>
+ <jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
@@ -451,11 +451,6 @@
<artifactId>jboss-javaee</artifactId>
<version>${jboss.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jboss-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -470,6 +465,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 10:54:45 UTC (rev 8181)
@@ -41,12 +41,5 @@
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
-# [JBWS-2194] Cannot get security domain declared through jboss.xml DD (fixed
-# # starting from AS 5 trunk container integration, next release 5.0.0.CR2)
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/pom.xml 2008-09-18 10:54:45 UTC (rev 8181)
@@ -136,18 +136,18 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>container</classifier>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/profiles.xml.example 2008-09-18 10:54:45 UTC (rev 8181)
@@ -14,8 +14,8 @@
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
+ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
+ <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.home>
</properties>
</profile>
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-09-18 10:54:45 UTC (rev 8181)
@@ -135,10 +135,6 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
- <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
- <!-- wsconsume will fail with a LinkageError too -->
- <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/>
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 10:21:43 UTC (rev 8180)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 10:54:45 UTC (rev 8181)
@@ -104,7 +104,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR1:jar</include>
+ <include>*:jbossws-jboss500CR2:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -124,7 +124,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR1:jar:container</include>
+ <include>*:jbossws-jboss500CR2:jar:container</include>
</includes>
</dependencySet>
<dependencySet>
16 years, 1 month
JBossWS SVN: r8180 - framework/trunk/hudson.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-18 06:21:43 -0400 (Thu, 18 Sep 2008)
New Revision: 8180
Modified:
framework/trunk/hudson/ant.properties.example
Log:
migrate from CR1 -> CR2 and from CR2 -> GA
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2008-09-18 09:27:06 UTC (rev 8179)
+++ framework/trunk/hudson/ant.properties.example 2008-09-18 10:21:43 UTC (rev 8180)
@@ -37,12 +37,12 @@
hudson.jboss424.build=jboss-4.2.4.GA
hudson.jboss424.rev=HEAD
-hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_CR1
-hudson.jboss500.build=jboss-5.0.0.CR1
+hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_CR2
+hudson.jboss500.build=jboss-5.0.0.CR2
hudson.jboss500.rev=HEAD
hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss501.build=jboss-5.0.0.CR2
+hudson.jboss501.build=jboss-5.0.0.GA
hudson.jboss501.rev=HEAD
hudson.mail.recipients=
16 years, 1 month
JBossWS SVN: r8179 - projects/wiki.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-09-18 05:27:06 -0400 (Thu, 18 Sep 2008)
New Revision: 8179
Modified:
projects/wiki/LocalSettings.php
Log:
Updating mediawiki for the new server
Modified: projects/wiki/LocalSettings.php
===================================================================
--- projects/wiki/LocalSettings.php 2008-09-17 15:57:21 UTC (rev 8178)
+++ projects/wiki/LocalSettings.php 2008-09-18 09:27:06 UTC (rev 8179)
@@ -70,10 +70,10 @@
$wgDBtype = "mysql";
$wgDBserver = "localhost";
-$wgDBname = "wikidb";
-$wgDBuser = "wikiuser";
-$wgDBpassword = "deadbeefjboss";
-$wgDBport = "5432";
+$wgDBname = "mediawiki";
+$wgDBuser = "mediawiki";
+$wgDBpassword = "z635u8e2";
+$wgDBport = "3306";
$wgDBprefix = "";
# Schemas for Postgres
@@ -144,8 +144,8 @@
# Secure registration
require_once( "extensions/recaptcha/ReCaptcha.php" );
// Sign up for these at http://recaptcha.net/api/getkey
-$recaptcha_public_key = '6LeaFQAAAAAAANdJOabOzJZc2XIPMX9GaTUeu6zu';
-$recaptcha_private_key = '6LeaFQAAAAAAADf35ShIh9BuBytm8o_Vs58VaDQr';
+$recaptcha_public_key = '6LchLAMAAAAAAA5weDv_hlLRGot823O923x4rcqy';
+$recaptcha_private_key = '6LchLAMAAAAAADncwyYiRkdPV5LUSBbqyXGl-a9s';
# PDF export
#require_once("extensions/SpecialPdfPrint.php");
16 years, 1 month
JBossWS SVN: r8177 - in stack/native/trunk: modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-09-17 09:48:08 -0400 (Wed, 17 Sep 2008)
New Revision: 8177
Modified:
stack/native/trunk/.classpath
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
Log:
[JBWS-1397] remove obsolete FIXME
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-09-16 16:37:15 UTC (rev 8176)
+++ stack/native/trunk/.classpath 2008-09-17 13:48:08 UTC (rev 8177)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="modules/saaj/src/main/java"/>
- <classpathentry kind="src" path="modules/testsuite/framework-tests/target/wsconsume/java"/>
<classpathentry kind="src" path="modules/testsuite/native-tests/target/wsconsume/java"/>
- <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/>
<classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/>
<classpathentry kind="src" path="modules/jaxrpc/src/main/java"/>
<classpathentry kind="src" path="modules/jaxws/src/main/java"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2008-09-16 16:37:15 UTC (rev 8176)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2008-09-17 13:48:08 UTC (rev 8177)
@@ -56,23 +56,9 @@
if (port == null)
{
- if (!isTargetJBoss50())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
- }
- else
- {
- System.out.println("FIXME [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x");
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = getResourceURL("jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl");
- URL mappingURL = getResourceURL("jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml");
- QName qname = new QName("http://org.jboss.ws/samples/jsr109pojo", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-rpc");
- }
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
+ port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
}
}
16 years, 1 month
JBossWS SVN: r8176 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-09-16 12:37:15 -0400 (Tue, 16 Sep 2008)
New Revision: 8176
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBAS-5673] Re-enabling test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-09-16 16:27:25 UTC (rev 8175)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-09-16 16:37:15 UTC (rev 8176)
@@ -108,6 +108,3 @@
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBAS-5673] Metadata processing needs to be redone
-org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.*
16 years, 1 month
JBossWS SVN: r8175 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-09-16 12:27:25 -0400 (Tue, 16 Sep 2008)
New Revision: 8175
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBAS-5673] Re-enabling test
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-09-16 16:17:36 UTC (rev 8174)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-09-16 16:27:25 UTC (rev 8175)
@@ -43,6 +43,3 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBAS-5673] Metadata processing needs to be redone
-org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.*
16 years, 1 month