JBossWS SVN: r15401 - in projects/plugins/maven/jaxws-tools/trunk: src/test/resources/test-embedded/testEndorse and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 18:54:03 -0500 (Thu, 15 Dec 2011)
New Revision: 15401
Modified:
projects/plugins/maven/jaxws-tools/trunk/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
Log:
[JBWS-3400] Fixing some warnings with Maven 3 and updating some plugins' version
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.9.GA</version>
+ <version>1.0.10.GA</version>
</parent>
<!-- Source Control Management -->
@@ -85,6 +85,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.8</version>
</plugin>
</plugins>
</reporting>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-15 23:52:59 UTC (rev 15400)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-15 23:54:03 UTC (rev 15401)
@@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
12 years, 9 months
JBossWS SVN: r15400 - stack/cxf/trunk/modules/addons/transports/http/httpserver.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 18:52:59 -0500 (Thu, 15 Dec 2011)
New Revision: 15400
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
Log:
[JBWS-3400] Prevent junit from leaking into compile time dependency:tree
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-12-15 23:20:45 UTC (rev 15399)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-12-15 23:52:59 UTC (rev 15400)
@@ -32,6 +32,12 @@
<dependency>
<groupId>org.jboss.com.sun.httpserver</groupId>
<artifactId>httpserver</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Spring -->
12 years, 9 months
JBossWS SVN: r15399 - projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 18:20:45 -0500 (Thu, 15 Dec 2011)
New Revision: 15399
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java
Log:
[JBWS-3400] Minor updates
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2011-12-15 23:20:45 UTC (rev 15399)
@@ -110,12 +110,13 @@
}
/**
- * Return the plugin dependencies that are required to actually call the tools
+ * Return the plugin dependencies that are required to actually call the tools in fork mode
* (jbossws-common-tools and his transitive dependencies getopt and log4j)
- //at the *end* of the list, add the required plugin dependency
- //that do not come in from the stack dependency tree because:
- //1) jbossws-common-tools is not a required dep for stack clients
- //2) log4j and getopt need to be provided scope deps, hence are not transitive
+ * Those dependencies would usually be added at the end of the classpath as they do not come
+ * in from the stack dependency tree because:
+ * 1) jbossws-common-tools is not a required dep for stack clients
+ * 2) log4j and getopt need to be provided scope deps in jbossws-commons-tools, hence they
+ * are not transitive
*
* @return a list with the required plugin dependencies
*/
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-15 23:20:45 UTC (rev 15399)
@@ -27,7 +27,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2011-12-15 23:20:45 UTC (rev 15399)
@@ -56,8 +56,8 @@
protected List<String> testClasspathElements;
/**
+ * The plugin dependency artifacts
*
- *
* @parameter default-value="${plugin.artifacts}"
* @required
* @readonly
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2011-12-15 23:20:45 UTC (rev 15399)
@@ -56,8 +56,8 @@
protected List<String> testClasspathElements;
/**
+ * The plugin dependency artifacts
*
- *
* @parameter default-value="${plugin.artifacts}"
* @required
* @readonly
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2011-12-15 23:20:45 UTC (rev 15399)
@@ -56,8 +56,8 @@
protected List<String> classpathElements;
/**
+ * The plugin dependency artifacts
*
- *
* @parameter default-value="${plugin.artifacts}"
* @required
* @readonly
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2011-12-15 23:20:45 UTC (rev 15399)
@@ -56,8 +56,8 @@
protected List<String> classpathElements;
/**
+ * The plugin dependency artifacts
*
- *
* @parameter default-value="${plugin.artifacts}"
* @required
* @readonly
12 years, 9 months
JBossWS SVN: r15398 - in projects/plugins/maven/jaxws-tools/trunk: src/main/java/org/jboss/ws/plugins/tools and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 18:15:03 -0500 (Thu, 15 Dec 2011)
New Revision: 15398
Removed:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml
Modified:
projects/plugins/maven/jaxws-tools/trunk/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
Log:
[JBWS-3400] Moving plugin to JBossWS-CXF 4.0.0.CR1 / JBossWS-Native 4.0.0.CR2
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -7,7 +7,7 @@
<artifactId>maven-jaxws-tools-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -25,7 +25,9 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.4.0.CR1</jbossws.spi.version>
+ <jbossws.common.tools.version>1.0.0.CR1</jbossws.common.tools.version>
+ <getopt.version>1.0.13</getopt.version>
+ <log4j.version>1.2.14</log4j.version>
<maven.project.version>2.0.11</maven.project.version>
<maven.plugin.api.version>2.0.4</maven.plugin.api.version>
<maven.invoker.plugin.version>1.5</maven.invoker.plugin.version>
@@ -38,10 +40,20 @@
<dependencies>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi.version}</version>
+ <artifactId>jbossws-common-tools</artifactId>
+ <version>${jbossws.common.tools.version}</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ <version>${getopt.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${maven.project.version}</version>
@@ -117,19 +129,6 @@
</pomIncludes>
</configuration>
</execution>
- <execution>
- <id>integration-test-metro</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- <configuration>
- <cloneProjectsTo>${project.build.directory}/test-embedded-metro</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom-metro.xml</pomInclude>
- </pomIncludes>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -25,8 +25,10 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.project.MavenProject;
@@ -81,6 +83,8 @@
*/
public abstract List<String> getClasspathElements();
+ public abstract List<Artifact> getPluginArtifacts();
+
/**
* Update the current Maven project source roots with the generated classes / resources
*/
@@ -104,6 +108,36 @@
}
return new URLClassLoader(urls, null);
}
+
+ /**
+ * Return the plugin dependencies that are required to actually call the tools
+ * (jbossws-common-tools and his transitive dependencies getopt and log4j)
+ //at the *end* of the list, add the required plugin dependency
+ //that do not come in from the stack dependency tree because:
+ //1) jbossws-common-tools is not a required dep for stack clients
+ //2) log4j and getopt need to be provided scope deps, hence are not transitive
+ *
+ * @return a list with the required plugin dependencies
+ */
+ protected List<String> getRequiredPluginDependencyPaths()
+ {
+ List<String> result = new ArrayList<String>(3);
+ for (Artifact s : getPluginArtifacts()) {
+ if ("org.jboss.ws".equals(s.getGroupId()) && "jbossws-common-tools".equals(s.getArtifactId()))
+ {
+ result.add(s.getFile().getAbsolutePath());
+ }
+ else if ("gnu-getopt".equals(s.getGroupId()) && "getopt".equals(s.getArtifactId()))
+ {
+ result.add(s.getFile().getAbsolutePath());
+ }
+ else if ("log4j".equals(s.getGroupId()) && "log4j".equals(s.getArtifactId()))
+ {
+ result.add(s.getFile().getAbsolutePath());
+ }
+ }
+ return result;
+ }
public Boolean getExtension()
{
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -27,6 +27,7 @@
import java.util.LinkedList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
@@ -140,6 +141,10 @@
params.setWsdlLocation(wsdlLocation);
params.setArgLine(argLine);
params.setFork(fork);
+ if (fork)
+ {
+ params.setAdditionalPluginDependencies(getRequiredPluginDependencyPaths());
+ }
WSContractDelegate delegate = new WSContractDelegate(getLog());
for (String wsdl : wsdls)
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -101,6 +101,10 @@
params.setSourceDirectory(sourceDirectory);
params.setFork(fork);
params.setArgLine(argLine);
+ if (fork)
+ {
+ params.setAdditionalPluginDependencies(getRequiredPluginDependencyPaths());
+ }
WSContractDelegate delegate = new WSContractDelegate(getLog());
delegate.runProvider(params);
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -24,6 +24,8 @@
import java.io.File;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Run wsconsume tool (for tests)
*
@@ -52,6 +54,15 @@
* @readonly
*/
protected List<String> testClasspathElements;
+
+ /**
+ *
+ *
+ * @parameter default-value="${plugin.artifacts}"
+ * @required
+ * @readonly
+ */
+ private List<Artifact> pluginArtifacts;
@Override
public File getOutputDirectory()
@@ -70,4 +81,10 @@
{
project.addTestCompileSourceRoot(sourceDirectory.getAbsolutePath());
}
+
+ @Override
+ public List<Artifact> getPluginArtifacts()
+ {
+ return pluginArtifacts;
+ }
}
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -24,6 +24,8 @@
import java.io.File;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Runs wsprovide tool (for tests)
*
@@ -53,6 +55,15 @@
*/
protected List<String> testClasspathElements;
+ /**
+ *
+ *
+ * @parameter default-value="${plugin.artifacts}"
+ * @required
+ * @readonly
+ */
+ private List<Artifact> pluginArtifacts;
+
@Override
public File getOutputDirectory()
{
@@ -70,4 +81,10 @@
{
project.addTestCompileSourceRoot(sourceDirectory.getAbsolutePath());
}
+
+ @Override
+ public List<Artifact> getPluginArtifacts()
+ {
+ return pluginArtifacts;
+ }
}
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -22,12 +22,13 @@
package org.jboss.ws.plugins.tools;
import java.io.File;
+import java.net.URLClassLoader;
import java.util.List;
public class WSContractConsumerParams
{
private boolean fork;
- private ClassLoader loader;
+ private URLClassLoader loader;
private List<String> additionalCompilerClassPath;
private List<String> bindingFiles;
private File catalog;
@@ -41,7 +42,16 @@
private String targetPackage;
private String wsdlLocation;
private String argLine;
+ private List<String> additionalPluginDependencies;
+ public List<String> getAdditionalPluginDependencies()
+ {
+ return additionalPluginDependencies;
+ }
+ public void setAdditionalPluginDependencies(List<String> additionalPluginDependencies)
+ {
+ this.additionalPluginDependencies = additionalPluginDependencies;
+ }
public boolean isAdditionalHeaders()
{
return additionalHeaders;
@@ -66,11 +76,11 @@
{
return fork;
}
- public void setLoader(ClassLoader loader)
+ public void setLoader(URLClassLoader loader)
{
this.loader = loader;
}
- public ClassLoader getLoader()
+ public URLClassLoader getLoader()
{
return loader;
}
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -59,7 +59,7 @@
private void runProviderInProcess(WSContractProviderParams params) throws Exception
{
ClassLoader loader = params.getLoader();
- Class<?> providerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractProvider");
+ Class<?> providerClass = loader.loadClass("org.jboss.ws.api.tools.WSContractProvider");
Object provider = providerClass.getMethod("newInstance").invoke(null);
setupProvider(providerClass, provider, params);
Method m = providerClass.getMethod("provide", new Class<?>[]{String.class});
@@ -74,7 +74,8 @@
{
classpath.add(url.getFile());
}
- List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.wsf.spi.tools.cmd.WSProvide");
+ classpath.addAll(params.getAdditionalPluginDependencies());
+ List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.ws.tools.cmd.WSProvide");
String commandLine = getProviderCommandLine(commandList, params);
if (log.isDebugEnabled())
@@ -107,7 +108,7 @@
private void runConsumerInProcess(WSContractConsumerParams params, String wsdl) throws Exception
{
ClassLoader loader = params.getLoader();
- Class<?> consumerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractConsumer");
+ Class<?> consumerClass = loader.loadClass("org.jboss.ws.api.tools.WSContractConsumer");
Object consumer = consumerClass.getMethod("newInstance").invoke(null);
setupConsumer(consumerClass, consumer, params);
Method m = consumerClass.getMethod("consume", new Class<?>[]{String.class});
@@ -116,7 +117,14 @@
private void runConsumerOutOfProcess(WSContractConsumerParams params, String wsdl) throws Exception
{
- List<String> commandList = initCommandList(params.getArgLine(), params.getAdditionalCompilerClassPath(), "org.jboss.wsf.spi.tools.cmd.WSConsume");
+ List<String> classpath = new LinkedList<String>();
+ URL[] urls = params.getLoader().getURLs();
+ for (URL url : urls)
+ {
+ classpath.add(url.getFile());
+ }
+ classpath.addAll(params.getAdditionalPluginDependencies());
+ List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.ws.tools.cmd.WSConsume");
String commandLine = getConsumerCommandLine(commandList, params, wsdl);
if (log.isDebugEnabled())
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -23,6 +23,7 @@
import java.io.File;
import java.net.URLClassLoader;
+import java.util.List;
public class WSContractProviderParams
{
@@ -36,7 +37,16 @@
private File resourceDirectory;
private File sourceDirectory;
private String argLine;
+ private List<String> additionalPluginDependencies;
+ public List<String> getAdditionalPluginDependencies()
+ {
+ return additionalPluginDependencies;
+ }
+ public void setAdditionalPluginDependencies(List<String> additionalPluginDependencies)
+ {
+ this.additionalPluginDependencies = additionalPluginDependencies;
+ }
public boolean isFork()
{
return fork;
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -24,6 +24,8 @@
import java.io.File;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Runs wsconsume tool
*
@@ -53,6 +55,15 @@
*/
protected List<String> classpathElements;
+ /**
+ *
+ *
+ * @parameter default-value="${plugin.artifacts}"
+ * @required
+ * @readonly
+ */
+ private List<Artifact> pluginArtifacts;
+
@Override
protected void updateProjectSourceRoots()
{
@@ -70,4 +81,10 @@
{
return classpathElements;
}
+
+ @Override
+ public List<Artifact> getPluginArtifacts()
+ {
+ return pluginArtifacts;
+ }
}
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398)
@@ -24,6 +24,8 @@
import java.io.File;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Runs wsprovide tool
*
@@ -52,6 +54,15 @@
* @readonly
*/
protected List<String> classpathElements;
+
+ /**
+ *
+ *
+ * @parameter default-value="${plugin.artifacts}"
+ * @required
+ * @readonly
+ */
+ private List<Artifact> pluginArtifacts;
@Override
protected void updateProjectSourceRoots()
@@ -70,4 +81,10 @@
{
return classpathElements;
}
+
+ @Override
+ public List<Artifact> getPluginArtifacts()
+ {
+ return pluginArtifacts;
+ }
}
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -120,17 +120,23 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR1</version>
+ <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that prevents junit from leaking into the dependency tree -->
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-factories</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR1</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>1.0.0.Beta1</version>
+ <version>2.0.0.Final</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -115,12 +115,12 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR2</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>1.0.0.Beta1</version>
+ <version>2.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR1</version>
</dependency>
</dependencies>
</project>
Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>testWsConsume</name>
- <groupId>org.jboss.ws.plugins.maven.tests</groupId>
- <artifactId>testWsConsume</artifactId>
- <packaging>jar</packaging>
- <version>@pom.version@</version>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <maxmem>256M</maxmem>
- <fork>${compiler.fork}</fork>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jboss.ws.plugins</groupId>
- <artifactId>maven-jaxws-tools-plugin</artifactId>
- <version>@pom.version@</version>
- <configuration>
- <verbose>true</verbose>
- </configuration>
- <executions>
- <execution>
- <id>First execution</id>
- <goals>
- <goal>wsconsume</goal>
- </goals>
- <configuration>
- <wsdls>
- <wsdl>${basedir}/test.wsdl</wsdl>
- </wsdls>
- <targetPackage>foo.bar</targetPackage>
- </configuration>
- </execution>
- <execution>
- <id>Second execution</id>
- <goals>
- <goal>wsconsume</goal>
- </goals>
- <configuration>
- <wsdls>
- <wsdl>${basedir}/test2.wsdl</wsdl>
- </wsdls>
- <targetPackage>foo.bar2</targetPackage>
- <sourceDirectory>${project.build.directory}/generated/java-sources</sourceDirectory>
- <extension>true</extension>
- <fork>true</fork>
- </configuration>
- </execution>
- <execution>
- <id>Third execution</id>
- <goals>
- <goal>wsconsume</goal>
- </goals>
- <configuration>
- <wsdls>
- <wsdl>${basedir}/test.wsdl</wsdl>
- <wsdl>${basedir}/test2.wsdl</wsdl>
- </wsdls>
- </configuration>
- </execution>
- <execution>
- <id>Forth execution</id>
- <goals>
- <goal>wsconsume-test</goal>
- </goals>
- <configuration>
- <wsdls>
- <wsdl>${basedir}/test.wsdl</wsdl>
- <wsdl>${basedir}/test2.wsdl</wsdl>
- </wsdls>
- <fork>true</fork>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws.metro</groupId>
- <artifactId>jbossws-metro-client</artifactId>
- <version>3.3.1.GA</version>
- </dependency>
- </dependencies>
-</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR2</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -71,7 +71,13 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR1</version>
+ <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that prevents junit from leaking into the dependency tree -->
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-15 16:56:37 UTC (rev 15397)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-15 23:15:03 UTC (rev 15398)
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>3.4.0.CR1</version>
+ <version>4.0.0.CR2</version>
</dependency>
</dependencies>
</project>
12 years, 9 months
JBossWS SVN: r15397 - stack/native/trunk/modules/dist/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 11:56:37 -0500 (Thu, 15 Dec 2011)
New Revision: 15397
Modified:
stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS-3393] Synch assembly-bin-dist
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-12-15 16:47:39 UTC (rev 15396)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-12-15 16:56:37 UTC (rev 15397)
@@ -95,7 +95,6 @@
<unpackOptions>
<includes>
<include>ant-import/**</include>
- <include>java/org/jboss/test/ws/console/**</include>
<include>java/org/jboss/test/helper/**</include>
<include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
@@ -103,7 +102,6 @@
<include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>java/org/jboss/test/ws/saaj/**</include>
- <include>resources/console/**</include>
<include>resources/jaxrpc/samples/**</include>
<include>resources/jaxws/samples/**</include>
<include>resources/jaxws/smoke/**</include>
12 years, 9 months
JBossWS SVN: r15396 - in stack/cxf/trunk/modules: dist/src/main/scripts and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 11:47:39 -0500 (Thu, 15 Dec 2011)
New Revision: 15396
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3399] Splitting cxf-tests into samples and non-samples and adding the latter group to bin-dist
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 16:44:10 UTC (rev 15395)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 16:47:39 UTC (rev 15396)
@@ -105,6 +105,7 @@
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
<ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
<ant antfile="${tests.dir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${tests.dir}/ant-import/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-12-15 16:44:10 UTC (rev 15395)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-12-15 16:47:39 UTC (rev 15396)
@@ -80,6 +80,23 @@
<include>test-excludes-*.txt</include>
</includes>
</fileSet>
+ <!-- Stack specific tests -->
+ <fileSet>
+ <directory>../testsuite/cxf-tests/src/test</directory>
+ <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory>
+ <includes>
+ <include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>java/org/jboss/wsf/test/**</include>
+ <include>resources/jaxws/samples/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../testsuite/cxf-tests/scripts</directory>
+ <outputDirectory>jbossws-cxf-bin-dist/tests/ant-import</outputDirectory>
+ <includes>
+ <include>cxf-samples-jars-jaxws.xml</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
@@ -95,14 +112,12 @@
<includes>
<include>ant-import/**</include>
<include>java/org/jboss/test/helper/**</include>
- <include>java/org/jboss/test/ws/console/**</include>
<include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/smoke/**</include>
<include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>java/org/jboss/test/ws/saaj/**</include>
- <include>resources/console/**</include>
<include>resources/jaxrpc/samples/**</include>
<include>resources/jaxws/samples/**</include>
<include>resources/jaxws/smoke/**</include>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2011-12-15 16:44:10 UTC (rev 15395)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2011-12-15 16:47:39 UTC (rev 15396)
@@ -69,6 +69,7 @@
<property name="tests.output.dir" value="${project.build.directory}"/>
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="scripts/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws"/>
</tasks>
</configuration>
</execution>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 16:44:10 UTC (rev 15395)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 16:47:39 UTC (rev 15396)
@@ -215,194 +215,6 @@
</webinf>
</war>
- <!-- jaxws-samples-mtom -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-mtom.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/mtom/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/mtom/jaxws/*.class"/>
- </classes>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
-
- <!-- jaxws-samples-wsa -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-wsrm -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-api.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
- </classes>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- <manifest>
- <attribute name="Dependencies" value="org.apache.cxf"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-sign -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF" prefix="WEB-INF/classes">
- <include name="bob.jks" />
- <include name="bob.properties" />
- </zipfileset>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-sign-client -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/META-INF">
- <include name="alice.properties" />
- <include name="alice.jks" />
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-policy-sign-encrypt -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF" prefix="WEB-INF/classes">
- <include name="bob.jks" />
- <include name="bob.properties" />
- </zipfileset>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-sign-encrypt-client -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF">
- <include name="alice.properties" />
- <include name="alice.jks" />
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-policy-username-unsecure-transport -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-unsecure-transport.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-username -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-username-jaas -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/POJOEndpointAuthorizationInterceptor.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-username-jaas-digest -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/POJOEndpointAuthorizationInterceptor.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF">
- <include name="jaxws-endpoint-config.xml"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
- </manifest>
- </war>
-
- <!-- jaxws-samples-wsse-policy-username-jaas-ejb -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/EJB*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/ServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF">
- <include name="wsdl/*"/>
- <include name="jaxws-endpoint-config.xml"/>
- </metainf>
- <manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
- </manifest>
- </jar>
-
<!-- saaj-soap-connection -->
<war
warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war"
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2011-12-15 16:47:39 UTC (rev 15396)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ============================================================================== -->
+ <!-- Building -->
+ <!-- -->
+ <!-- Where to create your tests -->
+ <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
+ <!-- -->
+ <!-- ============================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-samples-mtom -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-mtom.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/mtom/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/mtom/jaxws/*.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsa -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-api.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-sign -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-sign-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-policy-sign-encrypt -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-sign-encrypt-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-policy-username-unsecure-transport -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-unsecure-transport.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-username -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-username-jaas -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/POJOEndpointAuthorizationInterceptor.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-username-jaas-digest -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/POJOEndpointAuthorizationInterceptor.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF">
+ <include name="jaxws-endpoint-config.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-samples-wsse-policy-username-jaas-ejb -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/EJB*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/ServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF">
+ <include name="wsdl/*"/>
+ <include name="jaxws-endpoint-config.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ </manifest>
+ </jar>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
12 years, 9 months
JBossWS SVN: r15395 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 11:44:10 -0500 (Thu, 15 Dec 2011)
New Revision: 15395
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3399] Adding xalan/serializer to bin dist client classpath as that's required for ws-security
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-15 09:42:16 UTC (rev 15394)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-15 16:44:10 UTC (rev 15395)
@@ -237,6 +237,10 @@
<fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
+ <include name="serializer-*.jar"/>
+ <include name="xalan-*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/org/jboss/xnio/main/">
<include name="xnio-api-*.jar"/>
</fileset>
@@ -375,6 +379,10 @@
<include name="jbossws-native-core-${jbossws-native-core.filename}.jar"/>
</fileset>
<!-- END ## jaxrpc tests ## -->
+ <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
+ <include name="serializer-*.jar"/>
+ <include name="xalan-*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/org/jboss/xnio/main/">
<include name="xnio-api-*.jar"/>
</fileset>
12 years, 9 months
JBossWS SVN: r15394 - in hudson/trunk: hudson-home and 47 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 04:42:16 -0500 (Thu, 15 Dec 2011)
New Revision: 15394
Added:
hudson/trunk/hudson-home/jobs/AS-LIGHT/
hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
Removed:
hudson/trunk/hudson-home/jobs/AS-6.0.0/
hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/
hudson/trunk/scripts/runjboss.sh
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
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.1-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.2-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml
hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml
hudson/trunk/scripts/jboss.sh
hudson/trunk/scripts/jbossws-qa.sh
Log:
[JBWS-3393] Remove support for AS 6 target container
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/ant.properties.example 2011-12-15 09:42:16 UTC (rev 15394)
@@ -6,7 +6,6 @@
jboss.repository=http://repository.jboss.org
# The JBoss settings
-jboss.server.instance=default
jboss.bind.address=localhost
# JDK settings
@@ -21,10 +20,6 @@
hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk
hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
-hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.Final
-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-as-7.0.0.Final
hudson.jboss700.rev=7.0.0.Final
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -36,7 +36,6 @@
<tr><th align=left>JBossWS Native:</th><td>@hudson.native.url@</td></tr>
<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><th align=left>@hudson.jboss701.build@</th><td>-r(a)hudson.jboss701.rev@ @hudson.jboss701.url@</td></tr>
<tr><th align=left>@hudson.jboss702.build@</th><td>-r(a)hudson.jboss702.rev@ @hudson.jboss702.url@</td></tr>
@@ -56,7 +55,7 @@
<jobNames class="tree-set">
<no-comparator/>
<string>AS-ALL</string>
- <string>AS-6.0.0</string>
+ <string>AS-LIGHT</string>
<string>AS-7.0.0</string>
<string>AS-7.0.1</string>
<string>AS-7.0.2</string>
@@ -70,24 +69,6 @@
</description>
</view>
- <!-- AS Tests -->
- <view>
- <owner reference="../../.."/>
- <jobNames class="tree-set">
- <no-comparator/>
- <string>AS-TESTS-ALL</string>
- <string>AS-TESTS-AS-6.0.0</string>
- </jobNames>
- <name>AS Tests</name>
- <description>
- <![CDATA[
- Run the JBossAS webservice testsuite.
- <p/>
- Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
-]]>
- </description>
- </view>
-
<!-- Native Tests -->
<view>
<owner reference="../../.."/>
@@ -95,17 +76,14 @@
<no-comparator/>
<string>NATIVE-ALL</string>
<string>NATIVE-LIGHT</string>
- <string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
- <string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
- <string>NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6</string>
@@ -128,32 +106,26 @@
<no-comparator/>
<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-7.0.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6</string>
@@ -175,33 +147,27 @@
<jobNames class="tree-set">
<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-7.0.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
- <string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
- <string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6</string>
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-6.0.0, AS-7.0.0, AS-7.1.0</childProjects>
+ <childProjects>AS-7.0.0, AS-7.0.1, AS-7.0.2, AS-7.1.0</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Added: hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>AS-7.1.0</childProjects>
+ <threshold>
+ <name>UNSTABLE</name>
+ <ordinal>1</ordinal>
+ <color>YELLOW</color>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Builds all AS servers that have not been tagged yet (hence might have daily changes)</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -4,12 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-CORE-AS-6.0.0-SUN-JDK-6
+ CXF-CORE-AS-7.0.0-SUN-JDK-6
-, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-7.0.0-SUN-JDK-6
-
, CXF-CORE-AS-7.0.1-SUN-JDK-6
, CXF-CORE-AS-7.0.2-SUN-JDK-6
@@ -24,10 +20,6 @@
, CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6
-, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
-
, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
, CXF-BINDIST-AS-7.0.1-SUN-JDK-6
@@ -44,10 +36,6 @@
, CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6
-, CXF-SRCDIST-AS-6.0.0-SUN-JDK-6
-
-, CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6
-
, CXF-SRCDIST-AS-7.0.0-SUN-JDK-6
, CXF-SRCDIST-AS-7.0.1-SUN-JDK-6
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: 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 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -4,12 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-CORE-AS-6.0.0-SUN-JDK-6
+ CXF-CORE-AS-7.0.0-SUN-JDK-6
-, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-7.0.0-SUN-JDK-6
-
, CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
, CXF-CORE-AS-7.0.1-SUN-JDK-6
@@ -24,10 +20,6 @@
, CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6
-, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
-
, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
, CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -4,14 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- NATIVE-CORE-AS-6.0.0-SUN-JDK-6
+ NATIVE-CORE-AS-7.0.0-SUN-JDK-6
-, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
-
-, NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6
-
-, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
-
, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
, NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6
Modified: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS="-Dinterop=true"
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@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS="-Dinterop=true"
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.2-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS="-Dinterop=true"
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS="-Dinterop=true"
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -4,12 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- NATIVE-CORE-AS-6.0.0-SUN-JDK-6
+ NATIVE-CORE-AS-7.0.0-SUN-JDK-6
-, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
-
-, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
-
, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
, NATIVE-CORE-AS-7.0.1-SUN-JDK-6
Modified: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
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@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss701
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.1/workspace/build/target/(a)hudson.jboss701.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss702
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.2/workspace/build/target/(a)hudson.jboss702.build@
#
Modified: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -16,7 +16,6 @@
TEST_OPTS=
JBOSS_TARGET=jboss710
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
#
Modified: hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>SWITCH-BINDIST-AS-6.0.0</childProjects>
+ <childProjects></childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-ALL, AS-TESTS-ALL, NATIVE-ALL, CXF-ALL, SWITCH-ALL</childProjects>
+ <childProjects>AS-ALL, NATIVE-ALL, CXF-ALL, SWITCH-ALL</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2011-12-15 09:42:16 UTC (rev 15394)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-ALL, AS-TESTS-ALL, NATIVE-LIGHT, CXF-LIGHT</childProjects>
+ <childProjects>AS-LIGHT, NATIVE-LIGHT, CXF-LIGHT</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/scripts/jboss.sh
===================================================================
--- hudson/trunk/scripts/jboss.sh 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/scripts/jboss.sh 2011-12-15 09:42:16 UTC (rev 15394)
@@ -19,14 +19,11 @@
cp $JBOSS_HOME/standalone/configuration/standalone-full.xml $JBOSS_HOME/standalone/configuration/standalone.xml
fi
-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
+RUN_CMD="$JBOSS_HOME/bin/standalone.sh"
+export LAUNCH_JBOSS_IN_BACKGROUND="true"
+export JBOSS_PIDFILE=$PIDFILE
+
#
# Helper to complain.
#
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-12-15 09:42:16 UTC (rev 15394)
@@ -15,17 +15,7 @@
echo "Copying default mgmt-users.properties to AS..."
cp $STACK_DIR/etc/mgmt-users.properties $JBOSS_HOME/standalone/configuration
fi;
- # HACK if running cxf on AS6 / AS71x, first install/update native
- if [ "$STACK_ID" = "cxf" ] && [[ $JBOSS_TARGET == jboss6* ]]; then
- echo "cxf stack with AS 6x, first installing native..."
- STACK_ID=native
- ORIG_STACK_DIR=$STACK_DIR
- STACK_DIR=$STACK_DIR/../../../NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-native/
- setupEnv
- redeployBinaryDistribution
- STACK_ID=cxf
- STACK_DIR=$ORIG_STACK_DIR
- fi;
+ # HACK if running cxf on AS71x, first install/update native
if [ "$STACK_ID" = "cxf" ] && [[ $JBOSS_TARGET == jboss71* ]]; then
echo "cxf stack with AS 71x, first installing native..."
STACK_ID=native
@@ -61,13 +51,8 @@
}
copyJBossLogs() {
- 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
+ cp $JBOSS_HOME/standalone/log/boot.log $WORKSPACE/jboss-boot.log
+ cp $JBOSS_HOME/standalone/log/server.log $WORKSPACE/jboss-server.log
}
copyTestLogs() {
@@ -76,28 +61,23 @@
}
removeJBossLogs() {
- 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
+ rm -f $JBOSS_HOME/standalone/log/boot.log
+ rm -f $JBOSS_HOME/standalone/log/server.log
}
ensureRunningJBoss() {
- 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"
+# 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
+# fi
}
logMavenDependencies() {
Deleted: hudson/trunk/scripts/runjboss.sh
===================================================================
--- hudson/trunk/scripts/runjboss.sh 2011-12-15 09:40:16 UTC (rev 15393)
+++ hudson/trunk/scripts/runjboss.sh 2011-12-15 09:42:16 UTC (rev 15394)
@@ -1,159 +0,0 @@
-#!/bin/bash
-### ====================================================================== ###
-## ##
-## JBoss Bootstrap Script ##
-## ##
-### ====================================================================== ###
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-GREP="grep"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to puke.
-#
-die() {
- warn $*
- exit 1
-}
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Read an optional running configuration file
-if [ "x$RUN_CONF" = "x" ]; then
- RUN_CONF="$JBOSS_HOME/bin/run.conf"
-fi
-if [ -r "$RUN_CONF" ]; then
- . "$RUN_CONF"
-fi
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-# Setup the classpath
-runjar="$JBOSS_HOME/bin/run.jar"
-if [ ! -f "$runjar" ]; then
- die "Missing required file: $runjar"
-fi
-JBOSS_BOOT_CLASSPATH="$runjar"
-
-# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
-# compatible distribution which JAVA_HOME points to
-if [ "x$JAVAC_JAR" = "x" ]; then
- JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
-fi
-if [ ! -f "$JAVAC_JAR" ]; then
- warn "Missing file: $JAVAC_JAR"
- warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE."
-fi
-
-if [ "x$JBOSS_CLASSPATH" = "x" ]; then
- JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
-else
- JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
-fi
-
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
-
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
-
- # Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
-fi
-
-# Setup JBosst Native library path
-JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native"
-if [ -d "$JBOSS_NATIVE_DIR" ]; then
- if [ "x$LD_LIBRARY_PATH" = "x" ]; then
- LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
- else
- LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
- fi
- export LD_LIBRARY_PATH
- if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
- else
- JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
- fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-
-# This should be removed when JBoss configuration XML files can be validated JBAS-6744
-JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
-
-if [ -d "/data/tmp" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=/data/tmp"
-elif [ -d "/tmp" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=/tmp"
-else
- echo "Cannot detect temporary directory";
- exit -1;
-fi
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# Display our environment
-echo "========================================================================="
-echo ""
-echo " JBoss Bootstrap Environment"
-echo ""
-echo " JBOSS_HOME: $JBOSS_HOME"
-echo ""
-echo " JAVA: $JAVA"
-echo ""
-echo " JAVA_OPTS: $JAVA_OPTS"
-echo ""
-echo " CLASSPATH: $JBOSS_CLASSPATH"
-echo ""
-echo "========================================================================="
-echo ""
-# enable monitor mode (job control needed)
-set -m
-STATUS=10
-while [ $STATUS -eq 10 ]
-do
-# Execute the JVM
- "$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -classpath "$JBOSS_CLASSPATH" \
- org.jboss.Main "$@" &> /dev/null &
- echo $! > $JBOSS_HOME/bin/jboss.pid
- fg
- STATUS=$?
- # if it doesn't work, you may want to take a look at this:
- # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
-done
12 years, 9 months
JBossWS SVN: r15393 - in stack/cxf/trunk: modules/client and 25 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 04:40:16 -0500 (Thu, 15 Dec 2011)
New Revision: 15393
Removed:
stack/cxf/trunk/modules/dist/management/
stack/cxf/trunk/modules/resources/src/main/resources/bin/
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3393] Remove support for AS 6 target container
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/build.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -33,7 +33,6 @@
<property name="dist.output.dir" value="${dist.dir}/target"/>
<property name="stack.output.dir" value="${stack.dir}/target"/>
<property name="stack.modules.dir" value="${stack.dir}/modules"/>
- <property name="stack.management.dir" value="${stack.modules.dir}/management"/>
<property name="stack.client.dir" value="${stack.modules.dir}/client"/>
<property name="stack.server.dir" value="${stack.modules.dir}/server"/>
<property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/>
@@ -43,8 +42,6 @@
<import file="${dist.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/>
- <property name="jbossws.default.server.deploy.conf" value="${stack.resources.dir}/resources/server-deploy.conf"/>
<property name="jbossws.default.modules.conf" value="${stack.resources.dir}/resources/modules-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
@@ -71,12 +68,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
- <isset property="profiles.profile.properties.jboss600.home"/>
- </condition>
- <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
- <isset property="profiles.profile.properties.jboss610.home"/>
- </condition>
<condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
<isset property="profiles.profile.properties.jboss700.home"/>
</condition>
@@ -91,16 +82,10 @@
</condition>
- <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss600.home"/>
- </not>
- <not>
- <isset property="jboss610.home"/>
- </not>
- <not>
<isset property="jboss700.home"/>
</not>
<not>
@@ -117,8 +102,6 @@
</fail>
<echo/>
- <echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss610.home=${jboss610.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/client/pom.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -261,29 +261,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>maven-archiver</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathLayoutType>custom</classpathLayoutType>
- <!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated-->
- <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- <manifestEntries>
- <Class-Path>jbossws-common-tools.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<failIfNoTests>false</failIfNoTests>
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -32,6 +32,7 @@
import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
/**
@@ -96,7 +97,7 @@
URL url = null;
try
{
- url = vfsRoot.findChild("WEB-INF/jbossws-cxf.xml").toURL();
+ url = vfsRoot.findChild("WEB-INF/" + Constants.JBOSSWS_CXF_SPRING_DD).toURL();
}
catch (Exception e)
{
@@ -106,7 +107,7 @@
{
try
{
- url = vfsRoot.findChild("META-INF/jbossws-cxf.xml").toURL();
+ url = vfsRoot.findChild("META-INF/" + Constants.JBOSSWS_CXF_SPRING_DD).toURL();
}
catch (Exception e)
{
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/pom.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -16,10 +16,6 @@
<properties>
</properties>
- <modules>
- <module>management</module>
- </modules>
-
<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
@@ -135,38 +131,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss700</artifactId>
<scope>provided</scope>
<exclusions>
@@ -263,12 +227,6 @@
<configuration>
<tasks>
<mkdir dir="${basedir}/target/exclude-file" />
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss600.txt">
- <param name="targetName" expression="jboss600" />
- </xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
- <param name="targetName" expression="jboss610" />
- </xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
<param name="targetName" expression="jboss700" />
</xslt>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-12-15 09:40:16 UTC (rev 15393)
@@ -13,20 +13,11 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss600
- ant deploy-jboss610
ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
- On AS 6 series, by default the SOAP stack will be installed to 'default'
-configuration. If users want to install SOAP stack to different JBossAS
-configuration then they can specify -Djboss.server.instance=foo JVM property.
-Supported configurations of the installer are 'default', 'all' and 'standard'.
-
- ant -Djboss.server.instance=standard deploy-jboss610
-
By default Spring Framework libraries are not installed to application
server. In order to do that, please add the -Dspring=true property option when
running the ant script:
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-12-15 09:40:16 UTC (rev 15393)
@@ -3,25 +3,22 @@
#
# Optional JBoss Home
-jboss600.home=(a)jboss600.home@
-jboss610.home=(a)jboss610.home@
jboss700.home=(a)jboss700.home@
jboss701.home=(a)jboss701.home@
jboss702.home=(a)jboss702.home@
jboss710.home=(a)jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss701|jboss702|jboss710]
+# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
jbossws.integration.target=jboss700
# The JBoss settings
-jboss.server.instance=default
jboss.bind.address=localhost
# JBoss Management console authentication (AS 7.1.x)
jbossws.deployer.authentication.username=admin
jbossws.deployer.authentication.password=admin
-# JBoss JMX invoker authentication (AS 6 / AS 7.0.x)
+# JBoss JMX invoker authentication (AS 7.0.x)
#jmx.authentication.username=admin
#jmx.authentication.password=admin
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -25,90 +25,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.0 -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss600" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
- </antcall>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring" description="Deploy jbossws to jboss600">
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}"
- defaultconf="${jbossws.default.deploy.conf}"
- defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"
- removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.1.0 -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss610" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
- </antcall>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss610 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss610">
- <property name="jbossws.integration.target" value="jboss610"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610,check-spring,install-spring" description="Deploy jbossws to jboss610">
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
- <copy todir="${jboss610.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
- <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
- <macro-undeploy-jbossws targetdir="${jboss610.server}"
- defaultconf="${jbossws.default.deploy.conf}"
- defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"
- removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] -->
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-7.0.x -->
<!-- ================================================================== -->
@@ -279,13 +195,6 @@
</condition>
</target>
- <target name="install-spring" if="spring-required">
- <antcall target="deploy-spring" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- </target>
-
<target name="install-spring-module70x" if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
<param name="installserver" value="${deploy.structure}"/>
@@ -302,25 +211,4 @@
</antcall>
</target>
- <!-- ================================================================== -->
- <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-create-deploy-conf">
- <attribute name="deploystructure"/>
- <sequential>
- <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/server/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
- <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/>
- <!-- Create jbossws-server-deploy.conf -->
- <fileset id="jbossws.server.deploy.fileset" dir="@{deploystructure}/server/${jboss.server.instance}" excludes="**/juddi-service.sar/**"/>
- <property name="jbossws.server.deploy.fileset" refid="jbossws.server.deploy.fileset"/>
- <echo file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" message="${jbossws.server.deploy.fileset}"/>
- <replace file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" token=";" value=" "/>
- </sequential>
- </macrodef>
-
</project>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -42,12 +42,6 @@
<taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/>
<taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/>
- <condition property="jbossws.integration.jboss7" value="true">
- <or>
- <equals arg1="${jbossws.integration.jboss700}" arg2="true"/>
- <equals arg1="${jbossws.integration.jboss710}" arg2="true"/>
- </or>
- </condition>
</target>
<target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project">
@@ -81,7 +75,6 @@
<entry key="project.name" value="${project.name.new}"/>
<entry key="project.type" value="${project.type.new}"/>
<entry key="project.jboss.home" value="${jboss.home}"/>
- <entry key="project.jboss.conf" value="${jboss.server.instance}"/>
</propertyfile>
<echo message=""/>
@@ -118,10 +111,7 @@
</fail>
</target>
- <target name="configure-project" depends="configure-project-6,configure-project-7">
- </target>
-
- <target name="configure-project-7" if="jbossws.integration.jboss7"> <!-- variable defined above -->
+ <target name="configure-project">
<mkdir dir="${project.home}/src/main/java"/>
<mkdir dir="${project.home}/src/main/resources"/>
<copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
@@ -151,39 +141,6 @@
<pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
</target>
- <target name="configure-project-6" if="jbossws.integration.jboss60">
- <mkdir dir="${project.home}/src/main/java"/>
- <mkdir dir="${project.home}/src/main/resources"/>
- <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
- <filterset refid="project"/>
- </copy>
- <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/>
- <path id="project.classpath">
- <pathelement location="${jboss.client}/cxf-api.jar"/>
- <pathelement location="${jboss.client}/cxf-common-schemas.jar"/>
- <pathelement location="${jboss.client}/cxf-common-utilities.jar"/>
- <pathelement location="${jboss.client}/cxf-rt-core.jar"/>
- <pathelement location="${jboss.client}/cxf-rt-ws-addr.jar"/>
- <pathelement location="${jboss.client}/cxf-rt-ws-policy.jar"/>
- <pathelement location="${jboss.client}/cxf-rt-ws-rm.jar"/>
- <pathelement location="${jboss.client}/cxf-rt-ws-security.jar"/>
- <pathelement location="${jboss.client}/FastInfoset.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-api.jar"/>
- <pathelement location="${jboss.client}/jbossws-api.jar"/>
- <pathelement location="${jboss.client}/jbossws-common.jar"/>
- <pathelement location="${jboss.client}/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/jbossws-cxf-client.jar"/>
- <pathelement location="${jboss.client}/geronimo-ws-metadata_2.0_spec.jar"/>
- <path refid="integration.target.javac.classpath" />
- </path>
- <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />
- <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" />
- <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
- </target>
-
<target name="delete-project" depends="validate-settings" description="Delete the configured user project">
<echo message="Deleting the entire project in ${project.home}" />
<delete dir="${project.home}" />
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -32,34 +32,15 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <property name="jboss.server.instance" value="default"/>
- <property name="jboss600.lib" value="${jboss600.home}/lib"/>
- <property name="jboss600.client" value="${jboss600.home}/client"/>
- <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
- <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
- <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
- <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
-
- <property name="jboss610.lib" value="${jboss610.home}/lib"/>
- <property name="jboss610.client" value="${jboss610.home}/client"/>
- <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
- <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
- <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
- <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
-
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/>
<property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
- <available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss610.available" file="${jboss610.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
<available property="jboss701.available" file="${jboss701.available.file}"/>
<available property="jboss702.available" file="${jboss702.available.file}"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -35,8 +35,6 @@
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/>
- <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/>
<property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
@@ -60,12 +58,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss60" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss700" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
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-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -5,17 +5,6 @@
<format>dir</format>
</formats>
<fileSets>
- <!-- bin -->
- <fileSet>
- <directory>../resources/src/main/resources/bin</directory>
- <outputDirectory>deploy-artifacts/bin</outputDirectory>
- <includes>
- <include>wsconsume.*</include>
- <include>wsprovide.*</include>
- <include>wsrunclient.*</include>
- </includes>
- </fileSet>
-
<!-- resources -->
<fileSet>
<directory>../server/target/resources</directory>
@@ -34,15 +23,6 @@
</includes>
</fileSet>
- <!-- management console and port component link servlet -->
- <fileSet>
- <directory>./management/target</directory>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <includes>
- <include>jbossws-cxf-management.war</include>
- <include>jbossws-cxf-management-pcl.war</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
@@ -95,8 +75,6 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss600:jar</include>
- <include>org.jboss.ws:jbossws-jboss610:jar</include>
<include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-*httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar clien!
t/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/co!
mmons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*!
.jar lib
/endorsed/*jaxws*.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -24,209 +24,7 @@
<project>
- <!--
- These patterns should be common for all supported containers.
- -->
- <patternset id="jbossws.bin.patternset">
- <include name="**/wsconsume.bat"/>
- <include name="**/wsconsume.sh"/>
- <include name="**/wsprovide.bat"/>
- <include name="**/wsprovide.sh"/>
- <include name="**/wsrunclient.bat"/>
- <include name="**/wsrunclient.sh"/>
- </patternset>
-
- <patternset id="jbossws.client.patternset">
- <include name="**/asm.jar"/>
- <include name="**/commons-beanutils.jar"/>
- <include name="**/commons-collections.jar"/>
- <include name="**/commons-lang.jar"/>
- <include name="**/cxf-*.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/jaxb-xjc.jar"/>
- <include name="**/jaxrpc-api.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
- <include name="**/httpserver.jar"/>
- <include name="**/jsr181-api.jar"/>
- <include name="**/jbossws-api.jar"/>
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-common-tools.jar"/>
- <include name="**/jbossws-cxf-client*.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/jbossws-cxf-transports-httpserver.jar"/>
- <include name="**/jdom.jar"/>
- <include name="**/neethi.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/velocity.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/wss4j.jar"/>
- <include name="**/wstx.jar"/>
- <include name="**/xmlschema-core.jar"/>
- <include name="**/FastInfoset.jar"/>
- <include name="**/wstx.jar"/>
- </patternset>
-
- <patternset id="jbossws.lib.patternset">
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </patternset>
-
- <patternset id="jbossws.lib.endorsed.patternset">
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/jbossws-cxf-factories.jar"/>
- </patternset>
-
- <patternset id="jbossws.server.lib.patternset">
- <include name="**/asm.jar"/>
- <include name="**/commons-beanutils.jar"/>
- <include name="**/cxf-*.jar"/>
- <include name="**/FastInfoset.jar"/>
- <include name="**/jaxrpc-api.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
- <include name="**/httpserver.jar"/>
- <include name="**/jsr181-api.jar"/>
- <include name="**/jboss-jaxb-intros.jar"/>
- <include name="**/jbossws-api.jar"/>
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/jdom.jar"/>
- <include name="**/neethi.jar"/>
- <include name="**/xmlschema-core.jar"/>
- <include name="**/xmlsec.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/wss4j.jar"/>
- </patternset>
-
- <patternset id="jbossws.service.lib.patternset">
- <include name="**/jbossws-cxf-transports-httpserver.jar"/>
- <include name="**/jbossws-cxf-client*.jar"/>
- <include name="**/jbossws-cxf-factories.jar"/>
- <include name="**/jbossws-cxf-server*.jar"/>
- </patternset>
-
- <patternset id="spring.patternset">
- <include name="**/spring-aop.jar"/>
- <include name="**/spring-asm.jar"/>
- <include name="**/spring-beans.jar"/>
- <include name="**/spring-context.jar"/>
- <include name="**/spring-core.jar"/>
- <include name="**/spring-expression.jar"/>
- <include name="**/spring-jms.jar"/>
- <include name="**/spring-tx.jar"/>
- </patternset>
-
<!-- ================================================================== -->
- <!-- Deploy Bin -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-bin">
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/bin">
- <patternset refid="jbossws.bin.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Lib -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-lib">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Lib Endorsed -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-endorsed">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Client -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-client">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- </fileset>
- </copy>
- <condition property="patch.jboss.metadata" value="true">
- <or>
- <equals arg1="${jbossid}" arg2="jboss501"/>
- <equals arg1="${jbossid}" arg2="jboss510"/>
- </or>
- </condition>
- <antcall target="modify-jboss-metadata">
- <param name="targetdir" value="@{targetdir}"/>
- <param name="thirdpartydir" value="@{thirdpartydir}"/>
- </antcall>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Server Lib -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-server-lib">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- <include name="**/jbossws-${jbossid}.jar"/>
- </fileset>
- </copy>
- <condition property="patch.jboss.metadata" value="true">
- <or>
- <equals arg1="${jbossid}" arg2="jboss501"/>
- <equals arg1="${jbossid}" arg2="jboss510"/>
- </or>
- </condition>
- <antcall target="modify-jboss-metadata">
- <param name="targetdir" value="@{targetdir}"/>
- <param name="thirdpartydir" value="@{thirdpartydir}"/>
- </antcall>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy JUDDI Service -->
<!-- ================================================================== -->
@@ -250,73 +48,6 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy JBossWS Console -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployment">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-cxf-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <antcall target="modify-jboss-integration">
- <param name="targetdir" value="@{targetdir}"/>
- </antcall>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-jaxrpc-deployers">
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration">
- <sequential>
- <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer">
- <include name="**/stack-agnostic-jboss-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </target>
-
- <!-- ================================================================== -->
<!-- Modules -->
<!-- ================================================================== -->
@@ -425,29 +156,6 @@
<fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/>
</target>
- <target name="deploy-jbossws-cxf" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="deploy-jbossws-cxf-with-jaxrpc" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-cxf-modules">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
@@ -478,24 +186,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-install-spring">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="spring.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <target name="deploy-spring">
- <macro-install-spring targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/>
- <macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-spring-module">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
@@ -533,68 +223,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-undeploy-jbossws">
- <attribute name="defaultconf"/>
- <attribute name="defaultserverconf"/>
- <attribute name="targetdir"/>
- <attribute name="modifyjbossintegration"/>
- <attribute name="removenativecore"/>
-
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
- <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.server.deploy.conf" srcfile="@{defaultserverconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}"/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.server.home}">
- <include name="**/juddi-service.sar/**"/>
- <include name="**/jbossws-console.war/**"/>
- <include name="**/jbossws.sar/**"/>
- </fileset>
- </delete>
- <antcall target="remove-jboss-integration">
- <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
- </antcall>
-
- <!-- delete content of last deployment -->
- <delete verbose="true">
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
- <delete verbose="true">
- <fileset dir="${jboss.server.home}" includes="${jbossws.server.deploy.conf}"/>
- </delete>
-
- <!-- [JBWS-2895] jbossws-native-core.jar is not removed by default from JBWS 3.3.0, as it's required for jaxrpc support -->
- <condition property="removenativecoreprop">
- <and>
- <istrue value="@{removenativecore}"/>
- </and>
- </condition>
- <antcall target="remove-native-core-from-client-and-common"/>
-
- </sequential>
- </macrodef>
-
- <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration">
- <delete verbose="true">
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/common">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- </delete>
- </target>
-
<target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration">
<delete verbose="true">
<fileset dir="${jboss.modules}">
@@ -603,17 +231,6 @@
</delete>
</target>
- <target name="remove-native-core-from-client-and-common" if="removenativecoreprop">
- <delete verbose="true">
- <fileset dir="${jboss.home}/client">
- <include name="**/jbossws-native-core.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/common">
- <include name="**/jbossws-native-core.jar"/>
- </fileset>
- </delete>
- </target>
-
<target name="process-jboss-integration">
<condition property="fixintegration">
<and>
@@ -622,17 +239,4 @@
</condition>
</target>
- <target name="modify-jboss-metadata" if="patch.jboss.metadata">
- <sequential>
- <copy
- tofile="${targetdir}/jboss-metadata.jar"
- failonerror="false"
- overwrite="true">
- <fileset dir="${thirdpartydir}">
- <include name="**/jbossws-${jbossid}-metadata.jar"/>
- </fileset>
- </copy>
- </sequential>
- </target>
-
</project>
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1 +0,0 @@
-deployers/jbossws.deployer/jbossws-cxf-*.jar deployers/jbossws.deployer/FastInfoset.jar deployers/jbossws.deployer/jboss-jaxb-intros.jar deployers/jbossws.deployer/jbossws-common.jar deployers/jbossws.deployer/jbossws-framework.jar deployers/jbossws.deployer/jbossws-native-core.jar deployers/jbossws.deployer/jbossws-native-factories.jar deployers/jbossws.deployer/jbossws-native-services.jar deployers/jbossws.deployer/jettison.jar deployers/jbossws.deployer/netty.jar deployers/jbossws.deployer/wscommons-policy.jar deployers/jbossws.deployer/policy.jar deployers/jbossws.deployer/wsdl4j.jar deployers/jbossws.deployer/xmlsec.jar deployers/jbossws.deployer/META-INF/jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml deployers/jbossws.deployer/META-INF/standard-*-config.xml deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/pom.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -266,39 +266,6 @@
</resource>
</resources>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.wsf.stack.cxf.config;
-
-import java.util.ResourceBundle;
-import java.util.concurrent.CountDownLatch;
-
-import org.apache.cxf.BusFactory;
-import org.jboss.logging.Logger;
-import org.jboss.ws.api.util.BundleUtils;
-
-
-/**
- * A bean installed during boot for initializing CXF
- *
- * @author alessio.soldano(a)jboss.com
- * @since 06-Opt-2010
- *
- */
-public class CXFInitializer
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(CXFInitializer.class);
- private static Logger logger = Logger.getLogger(CXFInitializer.class);
- private static CountDownLatch defaultBusCDL = new CountDownLatch(1);
-
- public void create() throws Exception
- {
- Thread defaultBusInitThread = new Thread(new DefautBusInitializer(defaultBusCDL), "JBossWS-CXF-DefaultBus-Init");
- defaultBusInitThread.setDaemon(true);
- defaultBusInitThread.start();
- }
-
- public void destroy() throws Exception
- {
- //NOOP
- }
-
- public static void waitForDefaultBusAvailability()
- {
- boolean trace = logger.isTraceEnabled();
- if (trace)
- logger.trace(Thread.currentThread() + " will wait for default bus availability...");
- try
- {
- defaultBusCDL.await();
- if (trace)
- logger.trace("Default bus now available: " + BusFactory.getDefaultBus(false));
- }
- catch (InterruptedException e)
- {
- logger.error(BundleUtils.getMessage(bundle, "INTERRUPTED"));
- throw new RuntimeException(e);
- }
- }
-
- private class DefautBusInitializer implements Runnable
- {
- private CountDownLatch cdl;
-
- public DefautBusInitializer(CountDownLatch cdl)
- {
- this.cdl = cdl;
- }
-
- @Override
- public void run()
- {
- long start = System.currentTimeMillis();
- try
- {
- BusFactory.getDefaultBus();
- if (logger.isTraceEnabled())
- {
- logger.info("Default bus started in " + (System.currentTimeMillis() - start) + " ms by "
- + Thread.currentThread());
- }
- }
- finally
- {
- cdl.countDown();
- }
- }
- }
-
-}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -30,7 +30,6 @@
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
-import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.wsf.stack.cxf.deployment.aspect;
-
-import org.jboss.ws.common.integration.JMSDeploymentAspect;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
-
-/**
- * The DeploymentAspect to register the jms endpoints
- *
- * @author <a href="ema(a)redhat.com">Jim Ma</a>
- */
-public class JMSEndpointRegistryDeploymentAspect extends JMSDeploymentAspect
-{
- private JMSEndpointRegistryDeploymentAspectDelegate aspect;
-
- public JMSEndpointRegistryDeploymentAspect()
- {
- if (SpringUtils.SPRING_AVAILABLE)
- {
- aspect = new JMSEndpointRegistryDeploymentAspectDelegate();
- }
- }
-
-
- @Override
- public void start(Deployment dep)
- {
- if (aspect != null)
- {
- aspect.start(dep);
- }
- }
-
- public void stop(Deployment dep)
- {
- if (aspect != null)
- {
- aspect.stop(dep);
- }
- }
-
-
-}
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,118 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.wsf.stack.cxf.deployment.aspect;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerRegistry;
-import org.apache.cxf.frontend.MethodDispatcher;
-import org.apache.cxf.frontend.SimpleMethodDispatcher;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.jms.JMSConfiguration;
-import org.apache.cxf.transport.jms.JMSDestination;
-import org.jboss.ws.common.integration.JMSDeploymentAspect;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.JMSEndpoint;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-
-/**
- * The DeploymentAspect to register the jms endpoints
- *
- * @author <a href="ema(a)redhat.com">Jim Ma</a>
- */
-class JMSEndpointRegistryDeploymentAspectDelegate extends JMSDeploymentAspect
-{
- private EndpointRegistry registry = null;
- @Override
- public void start(Deployment dep)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- if (registry == null)
- registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- Bus bus = dep.getAttachment(Bus.class);
- Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus);
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint;
- String endpointImplClass = jmsEndpoint.getTargetBeanName();
- JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass);
- if (jmsConfig != null)
- {
- jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination());
- jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination());
- }
-
- registry.register(jmsEndpoint);
- }
- }
-
- public void stop(Deployment dep)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- if (registry == null)
- registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- registry.unregister(ep);
- }
- }
-
- private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus)
- {
- Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>();
- ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class);
- for (Server server : serverRegsitry.getServers())
- {
- Destination destination = server.getDestination();
- if (destination instanceof JMSDestination)
- {
- JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig();
- String implClassName = getEndpointClassName(server);
- if (implClassName != null)
- {
- endpointJmsConfigMap.put(implClassName, jmsConfiguration);
- }
- }
- }
- return endpointJmsConfigMap;
- }
-
- private String getEndpointClassName(Server server)
- {
- MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get(
- MethodDispatcher.class.getName());
- if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher)
- {
- Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface()
- .getOperations().iterator().next());
- return method != null ? method.getDeclaringClass().getName() : null;
- }
- return null;
- }
-}
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.wsf.stack.cxf.deployment.aspect;
-
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.stack.cxf.config.CXFInitializer;
-
-/**
- * A synchronized version of the bus deployment aspect that waits for the CXFInitializer
- * and does single-thread deployment processing
- *
- * @author alessio.soldano(a)jboss.com
- * @since 25-Mar-2010
- */
-public class SynchronizedBusDeploymentAspect extends BusDeploymentAspect
-{
- @Override
- protected void startDeploymentBus(Deployment dep)
- {
- //ensure the default bus has been set on the server, then proceed
- CXFInitializer.waitForDefaultBusAvailability();
- //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon
- //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect
- synchronized (this)
- {
- super.startDeploymentBus(dep);
- }
- }
-
- @Override
- public void start(Deployment dep)
- {
- this.startDeploymentBus(dep);
- }
-}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -4,7 +4,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -50,9 +49,9 @@
if (mbeanServer == null)
{
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
+ for (Iterator<MBeanServer> i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
{
- mbeanServer = (MBeanServer)i.next();
+ mbeanServer = i.next();
if (mbeanServer.getClass().getName().startsWith("org.jboss"))
{
break;
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- CXF initializer, starts default bus, etc. -->
- <bean name="CXFInitializer" class="org.jboss.wsf.stack.cxf.config.CXFInitializer" />
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.ws.common.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- This should actually be in the stack-agnostic config file, it's here to avoid installing a CI -->
- <bean name="WSWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl">
- <property name="descriptorName">webservices.xml</property>
- </bean>
- <bean name="WSJBossWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.JBossWebservicesDescriptorParserImpl">
- <property name="descriptorName">jboss-webservices.xml</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.ws.common.monitoring.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.ws.common.monitoring.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
- </entry>
- </map>
- </property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,JAXBIntros</property>
- <property name="provides">StackDescriptor</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <property name="requires">JmsEndpointAddress</property>
- <property name="provides">ResourceResolver</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
- <property name="requires">ContainerMetaData,BusHolder</property>
- <property name="provides">StackInstanceProvider</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.ws.api.monitoring.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect">
- <property name="provides">BusHolder</property>
- <property name="requires">ResourceResolver,StackDescriptor</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
-</deployment>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -44,7 +44,6 @@
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <!--property name="requires" class="java.lang.String">JmsEndpointAddress</property--> <!-- TODO: why this requires, investigate? -->
<property name="provides" class="java.lang.String">ResourceResolver</property>
<property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
@@ -66,7 +65,6 @@
<property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
- <!--deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect"--> <!-- TODO: investigate why? -->
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
<property name="provides" class="java.lang.String">BusHolder</property>
<property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property>
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties, StackDescriptor</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
- </entry>
- </map>
- </property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackInstanceProvider</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
- <property name="provides">PublishedContract</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
- <property name="forJaxWs">false</property>
- </bean>
-
-</deployment>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -30,26 +30,6 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -123,16 +123,6 @@
</war>
<!-- jaxws-cxf-jms-api -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6.war"
- needxmlfile='false'>
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.class"/>
- <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/>
- </classes>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6/wsdl"
- prefix="WEB-INF/classes/META-INF/wsdl"/>
- </war>
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war"
needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
@@ -148,15 +138,6 @@
</war>
<!-- jaxws-jms-api-client -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6">
- <include name="wsdl/**/*" />
- <include name="jboss-dependency.xml"/>
- </metainf>
- </jar>
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/>
@@ -165,11 +146,6 @@
<include name="wsdl/**/*" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/hornetq-testqueue-as6.sar">
- <fileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6">
- <include name="hornetq-jms.xml"/>
- </fileset>
- </jar>
<!-- jaxws-jms-only-deployment -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar">
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -213,28 +213,12 @@
<include name="jboss-web.xml"/>
<include name="jbossws-cxf.xml"/>
<include name="wsdl/*"/>
- <!-- if these files deployed in war then it works ok on AS 6.0 but not on 5.1
- <include name="jboss-service.xml"/>
- <include name="login-config.xml"/>
- <include name="jbossws-users.properties"/>
- <include name="jbossws-roles.properties"/>
- -->
-
</webinf>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-server"/>
</manifest>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest-service.sar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF">
- <include name="jboss-service.xml"/>
- <include name="login-config.xml"/>
- <include name="jbossws-users.properties"/>
- <include name="jbossws-roles.properties"/>
- </metainf>
- </jar>
-
<!-- jaxws-samples-wsseEJB -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -44,24 +44,19 @@
{
public static Test suite()
{
- if (isTargetJBoss6()) {
- return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "hornetq-testqueue-as6.sar,jaxws-cxf-jms-api-as6-client.jar,jaxws-cxf-jms-api-as6.war");
- } else {
- return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war");
- }
+ return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war");
}
public void testServerSide() throws Exception
{
- final String asSuffix = isTargetJBoss6() ? "as6" : "as7";
- URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-" + asSuffix);
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-as7");
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
assertEquals("true", br.readLine());
}
public void testClientSide() throws Exception
{
- if (!isTargetJBoss6()) {
+ if (isTargetJBoss7()) {
System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7");
return;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -55,7 +55,7 @@
public void testJMSEndpointClientSide() throws Exception
{
- if (!isTargetJBoss6())
+ if (isTargetJBoss7())
{
System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7");
return;
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -55,7 +55,7 @@
public void testJMSEndpointClientSide() throws Exception
{
- if (!isTargetJBoss6())
+ if (isTargetJBoss7())
{
System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7");
return;
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -52,7 +52,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", !isTargetJBoss6());
+ return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", true);
}
public void testAuthorized() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -54,28 +54,20 @@
public static Test suite()
{
JBossWSCXFTestSetup testSetup;
- if (!isTargetJBoss6())
- {
- testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war");
- Map<String, String> authenticationOptions = new HashMap<String, String>();
- authenticationOptions.put("usersProperties",
- getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
- authenticationOptions.put("rolesProperties",
- getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
- authenticationOptions.put("hashAlgorithm", "SHA");
- authenticationOptions.put("hashEncoding", "BASE64");
- authenticationOptions.put("hashCharset", "UTF-8");
- authenticationOptions.put("hashUserPassword", "false");
- authenticationOptions.put("hashStorePassword", "true");
- authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
- authenticationOptions.put("unauthenticatedIdentity", "anonymous");
- testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
- }
- else
- {
- testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class,
- "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war");
- }
+ testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties",
+ getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("hashAlgorithm", "SHA");
+ authenticationOptions.put("hashEncoding", "BASE64");
+ authenticationOptions.put("hashCharset", "UTF-8");
+ authenticationOptions.put("hashUserPassword", "false");
+ authenticationOptions.put("hashStorePassword", "true");
+ authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
return testSetup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -49,7 +49,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", !isTargetJBoss6());
+ return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", true);
}
private EjbEndpoint getPort() throws Exception
@@ -79,14 +79,7 @@
}
catch (Exception ex)
{
- if (isTargetJBoss6())
- {
- assertEquals("Caller unauthorized", ex.getMessage());
- }
- else
- {
- assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed"));
- }
+ assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed"));
}
}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
- <!-- ==================================================================== -->
- <!-- Dynamic login config to install the login module using digest -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="jboss:service=DynamicLoginConfig">
- <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
- <!-- The service which supports dynamic processing of login-config.xml
- configurations.
- -->
- <depends optional-attribute-name="LoginConfigService">
- jboss.security:service=XMLLoginConfig
- </depends>
- <!-- Optionally specify the security mgr service to use when
- this service is stopped to flush the auth caches of the domains
- registered by this service.
- -->
- <depends optional-attribute-name="SecurityManagerService">
- jboss.security:service=JaasSecurityManager
- </depends>
- </mbean>
-</server>
Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,25 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-<policy>
-
- <application-policy name="JBossWSDigest">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option>
- <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option>
- <module-option name="hashAlgorithm">SHA</module-option>
- <module-option name="hashEncoding">BASE64</module-option>
- <module-option name="hashCharset">UTF-8</module-option>
- <module-option name="hashUserPassword">false</module-option>
- <module-option name="hashStorePassword">true</module-option>
- <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option>
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
-</policy>
-
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -387,15 +387,6 @@
</manifest>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest-service.sar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF">
- <include name="jboss-service.xml"/>
- <include name="login-config.xml"/>
- <include name="jbossws-users.properties"/>
- <include name="jbossws-roles.properties"/>
- </metainf>
- </jar>
-
<!-- jaxws-samples-wsse-policy-username-jaas-ejb -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -50,28 +50,20 @@
public static Test suite()
{
JBossWSCXFTestSetup testSetup;
- if (!isTargetJBoss6())
- {
- testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war");
- Map<String, String> authenticationOptions = new HashMap<String, String>();
- authenticationOptions.put("usersProperties",
- getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
- authenticationOptions.put("rolesProperties",
- getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
- authenticationOptions.put("hashAlgorithm", "SHA");
- authenticationOptions.put("hashEncoding", "BASE64");
- authenticationOptions.put("hashCharset", "UTF-8");
- authenticationOptions.put("hashUserPassword", "false");
- authenticationOptions.put("hashStorePassword", "true");
- authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
- authenticationOptions.put("unauthenticatedIdentity", "anonymous");
- testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
- }
- else
- {
- testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class,
- "jaxws-samples-wsse-policy-username-jaas-digest-service.sar jaxws-samples-wsse-policy-username-jaas-digest.war");
- }
+ testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties",
+ getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("hashAlgorithm", "SHA");
+ authenticationOptions.put("hashEncoding", "BASE64");
+ authenticationOptions.put("hashCharset", "UTF-8");
+ authenticationOptions.put("hashUserPassword", "false");
+ authenticationOptions.put("hashStorePassword", "true");
+ authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
return testSetup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", !isTargetJBoss6());
+ return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", true);
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-15 09:40:16 UTC (rev 15393)
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", !isTargetJBoss6());
+ return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", true);
}
public void test() throws Exception
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
- <!-- ==================================================================== -->
- <!-- Dynamic login config to install the login module using digest -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="jboss:service=DynamicLoginConfig">
- <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
- <!-- The service which supports dynamic processing of login-config.xml
- configurations.
- -->
- <depends optional-attribute-name="LoginConfigService">
- jboss.security:service=XMLLoginConfig
- </depends>
- <!-- Optionally specify the security mgr service to use when
- this service is stopped to flush the auth caches of the domains
- registered by this service.
- -->
- <depends optional-attribute-name="SecurityManagerService">
- jboss.security:service=JaasSecurityManager
- </depends>
- </mbean>
-</server>
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -1,25 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-<policy>
-
- <application-policy name="JBossWSDigest">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option>
- <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option>
- <module-option name="hashAlgorithm">SHA</module-option>
- <module-option name="hashEncoding">BASE64</module-option>
- <module-option name="hashCharset">UTF-8</module-option>
- <module-option name="hashUserPassword">false</module-option>
- <module-option name="hashStorePassword">true</module-option>
- <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option>
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
-</policy>
-
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -24,8 +24,6 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
- <hibernate.version>3.2.4.sp1</hibernate.version>
- <jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
<org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<log4j.output.dir>${project.build.directory}</log4j.output.dir>
@@ -100,12 +98,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
@@ -269,10 +261,6 @@
</includes>
<systemProperties>
<property>
- <name>jboss.server.instance</name>
- <value>${jboss.server.instance}</value>
- </property>
- <property>
<name>jboss.bind.address</name>
<value>${jboss.bind.address}</value>
</property>
@@ -367,10 +355,6 @@
</includes>
<systemProperties>
<property>
- <name>jboss.server.instance</name>
- <value>${jboss.server.instance}</value>
- </property>
- <property>
<name>jboss.bind.address</name>
<value>${jboss.bind.address}</value>
</property>
@@ -576,364 +560,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jboss.version>6.0.0.Final</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- <version>${jboss.version}</version>
- <exclusions>
- <!-- Exclusion for not depending on the container integration -->
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Exclusion for keeping control over Spring inclusion/exclusion -->
- <exclusion>
- <groupId>org.jboss.snowdrop</groupId>
- <artifactId>jboss-spring-deployer</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
- </configuration>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</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 -->
- <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
- </additionalClasspathElements>
- <excludes>
- <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
-
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
-
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
-
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
-
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
-
- <!--# [JBWS-2397] Fix jbws1797 testcase-->
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
-
- <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
- <!--# Seems MSFT interop. endpoints are down :(-->
- <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
-
- <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
-
- <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
-
- <!--# [JBWS-3026] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
- <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!--# [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss610
- Descr: JBoss-6.1.0 specific options
- -->
- <profile>
- <id>jboss610</id>
- <properties>
- <jboss.version>6.1.0.Final</jboss.version>
- <jbossws.integration.target>jboss610</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- <version>${jboss.version}</version>
- <exclusions>
- <!-- Exclusion for not depending on the container integration -->
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Exclusion for keeping control over Spring inclusion/exclusion -->
- <exclusion>
- <groupId>org.jboss.snowdrop</groupId>
- <artifactId>jboss-spring-deployer</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
- </configuration>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</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 -->
- <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
- </additionalClasspathElements>
- <excludes>
- <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
-
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
-
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
-
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
-
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
-
- <!--# [JBWS-2397] Fix jbws1797 testcase-->
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
-
- <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
- <!--# Seems MSFT interop. endpoints are down :(-->
- <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
-
- <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
-
- <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
-
- <!--# [JBWS-3026] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
- <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!--# [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss700
Descr: JBoss-7.0.0.Final specific options
-->
@@ -989,6 +615,7 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
<!-- AS7 compilation excludes -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<!-- EJB3 client API dependencies -->
@@ -1179,6 +806,7 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
<!-- AS7 compilation excludes -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<!-- EJB3 client API dependencies -->
@@ -1367,6 +995,7 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
<!-- AS7 compilation excludes -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<!-- EJB3 client API dependencies -->
@@ -1632,6 +1261,7 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
</testExcludes>
@@ -1744,26 +1374,7 @@
</properties>
</profile>
- <!--
- Name: no-jboss-server-instance
- Descr: Set the default jboss.server.instance
-
- command line cannot overwrite pom properties
- http://jira.codehaus.org/browse/MNG-3546
- -->
<profile>
- <id>no-jboss-server-instance</id>
- <activation>
- <property>
- <name>!jboss.server.instance</name>
- </property>
- </activation>
- <properties>
- <jboss.server.instance>default</jboss.server.instance>
- </properties>
- </profile>
-
- <profile>
<id>default-mgmt-security</id>
<activation>
<property>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
+++ stack/cxf/trunk/pom.xml 2011-12-15 09:40:16 UTC (rev 15393)
@@ -63,8 +63,6 @@
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
- <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.0-SNAPSHOT</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.0-SNAPSHOT</jbossws.jboss702.version>
@@ -145,30 +143,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss700</artifactId>
<version>${jbossws.jboss700.version}</version>
</dependency>
@@ -1279,30 +1253,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss610
- Descr: JBoss-6.1.0 specific options
- -->
- <profile>
- <id>jboss610</id>
- <properties>
- <jbossws.integration.target>jboss610</jbossws.integration.target>
- <jboss.home>${jboss610.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss700
Descr: JBoss-7.0.0.Final specific options
-->
12 years, 9 months
JBossWS SVN: r15392 - in stack/native/trunk: modules/client and 19 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-15 04:38:13 -0500 (Thu, 15 Dec 2011)
New Revision: 15392
Removed:
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
stack/native/trunk/modules/dist/management/
stack/native/trunk/modules/resources/src/main/resources/bin/
stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/client/pom.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/dist/pom.xml
stack/native/trunk/modules/dist/src/main/distro/Install.txt
stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml
stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
stack/native/trunk/modules/dist/src/main/distro/build.xml
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3393] Remove support for AS6 target container
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/build.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -41,8 +41,6 @@
<import file="${dist.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/>
- <property name="jbossws.default.server.deploy.conf" value="${stack.resources.dir}/resources/server-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
@@ -67,12 +65,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
- <isset property="profiles.profile.properties.jboss600.home"/>
- </condition>
- <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
- <isset property="profiles.profile.properties.jboss610.home"/>
- </condition>
<condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
<isset property="profiles.profile.properties.jboss700.home"/>
</condition>
@@ -86,16 +78,10 @@
<isset property="profiles.profile.properties.jboss710.home"/>
</condition>
- <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss600.home"/>
- </not>
- <not>
- <isset property="jboss610.home"/>
- </not>
- <not>
<isset property="jboss701.home"/>
</not>
<not>
@@ -112,8 +98,6 @@
</fail>
<echo/>
- <echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss610.home=${jboss610.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/client/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -40,19 +40,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Class-Path>jbossws-api.jar jbossws-spi.jar jbossws-common.jar jbossws-common-tools.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build/>
</project>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/core/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -15,7 +15,6 @@
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
- <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
@@ -204,34 +203,6 @@
</artifactItems>
</configuration>
</execution>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
</executions>
</plugin>
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
Deleted: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.ws.common.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- This should actually be in the stack-agnostic config file, it's here to avoid installing a CI -->
- <bean name="WSWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl">
- <property name="descriptorName">webservices.xml</property>
- </bean>
- <bean name="WSJBossWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.JBossWebservicesDescriptorParserImpl">
- <property name="descriptorName">jboss-webservices.xml</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.ws.common.monitoring.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.ws.common.monitoring.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties, StackDescriptor</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSNativeInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackInstanceProvider</property>
- </bean>
-
- <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.ws.api.monitoring.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
- <property name="provides">PublishedContract</property>
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- </bean>
-
-</deployment>
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -30,16 +30,6 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-native-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-native-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
file="${src.dir}/jbossws-native-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -17,10 +17,6 @@
<properties>
</properties>
- <modules>
- <module>management</module>
- </modules>
-
<dependencies>
<dependency>
<groupId>org.jboss.ws.native</groupId>
@@ -73,6 +69,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!--test-suite-->
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -108,38 +110,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss700</artifactId>
<scope>provided</scope>
<exclusions>
@@ -239,16 +209,6 @@
<mkdir dir="${basedir}/target/exclude-file" />
<xslt style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
- out="${basedir}/target/exclude-file/test-excludes-jboss600.txt">
- <param name="targetName" expression="jboss600" />
- </xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl"
- in="../testsuite/pom.xml"
- out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
- <param name="targetName" expression="jboss610" />
- </xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl"
- in="../testsuite/pom.xml"
out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
<param name="targetName" expression="jboss700" />
</xslt>
Modified: stack/native/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/Install.txt 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/distro/Install.txt 2011-12-15 09:38:13 UTC (rev 15392)
@@ -13,20 +13,11 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss600
- ant deploy-jboss610
ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
- On AS 6 series, by default the SOAP stack will be installed to 'default'
-configuration. If users want to install SOAP stack to different JBossAS
-configuration then can specify -Djboss.server.instance=foo JVM property.
-Supported configurations of the installer are 'default', 'all' and 'standard'.
-
- ant -Djboss.server.instance=standard deploy-jboss610
-
4.) Execute the samples to verify your installation
'ant tests'
Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-12-15 09:38:13 UTC (rev 15392)
@@ -3,25 +3,22 @@
#
# Optional JBoss Home
-jboss600.home=(a)jboss600.home@
-jboss610.home=(a)jboss610.home@
jboss700.home=(a)jboss700.home@
jboss701.home=(a)jboss701.home@
jboss702.home=(a)jboss702.home@
jboss710.home=(a)jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss701|jboss702|jboss710]
+# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
jbossws.integration.target=jboss700
# The JBoss settings
-jboss.server.instance=default
jboss.bind.address=localhost
# JBoss Management console authentication (AS 7.1.x)
jbossws.deployer.authentication.username=admin
jbossws.deployer.authentication.password=admin
-# JBoss JMX invoker authentication (AS 6 / AS 7.0.x)
+# JBoss JMX invoker authentication (AS 7.0.x)
#jmx.authentication.username=admin
#jmx.authentication.password=admin
Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -25,88 +25,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.0 -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss600" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}"
- defaultconf="${jbossws.default.deploy.conf}"
- defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"/><!-- [JBWS-2505] -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.1.0 -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss610" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss610 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss610">
- <property name="jbossws.integration.target" value="jboss610"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610" description="Deploy jbossws to jboss610">
- <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
- <copy todir="${jboss610.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
- <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
- <macro-undeploy-jbossws targetdir="${jboss610.server}"
- defaultconf="${jbossws.default.deploy.conf}"
- defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"/><!-- [JBWS-2505] -->
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-7.0.x -->
<!-- ================================================================== -->
@@ -266,41 +184,4 @@
<macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
- <!-- ================================================================== -->
- <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
- <!-- ================================================================== -->
-
- <patternset id="jbossws.deploy.conf.patternset">
- <exclude name="**/client/jbossws-native-core.jar"/>
- <exclude name="**/client/netty.jar"/>
- <exclude name="**/common/lib/jbossws-native-core.jar"/>
- <exclude name="**/common/lib/netty.jar"/>
- <exclude name="**/server/**"/>
- </patternset>
-
- <patternset id="jbossws.server.deploy.conf.patternset">
- <exclude name="**/juddi-service.sar/**"/>
- </patternset>
-
- <macrodef name="macro-create-deploy-conf">
- <attribute name="deploystructure"/>
- <sequential>
- <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}">
- <patternset refid="jbossws.deploy.conf.patternset"/>
- </fileset>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
- <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/>
- <!-- Create jbossws-server-deploy.conf -->
- <fileset id="jbossws.server.deploy.fileset" dir="@{deploystructure}/server/${jboss.server.instance}">
- <patternset refid="jbossws.server.deploy.conf.patternset"/>
- </fileset>
- <property name="jbossws.server.deploy.fileset" refid="jbossws.server.deploy.fileset"/>
- <echo file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" message="${jbossws.server.deploy.fileset}"/>
- <replace file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" token=";" value=" "/>
- </sequential>
- </macrodef>
-
</project>
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-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -45,12 +45,6 @@
<taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/>
<taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/>
- <condition property="jbossws.integration.jboss7" value="true">
- <or>
- <equals arg1="${jbossws.integration.jboss700}" arg2="true"/>
- <equals arg1="${jbossws.integration.jboss710}" arg2="true"/>
- </or>
- </condition>
</target>
<target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project">
@@ -84,7 +78,6 @@
<entry key="project.name" value="${project.name.new}"/>
<entry key="project.type" value="${project.type.new}"/>
<entry key="project.jboss.home" value="${jboss.home}"/>
- <entry key="project.jboss.conf" value="${jboss.server.instance}"/>
</propertyfile>
<echo message=""/>
@@ -121,10 +114,7 @@
</fail>
</target>
- <target name="configure-project" depends="configure-project-6,configure-project-7">
- </target>
-
- <target name="configure-project-7" if="jbossws.integration.jboss7"> <!-- Variable defined above -->
+ <target name="configure-project">
<mkdir dir="${project.home}/src/main/java"/>
<mkdir dir="${project.home}/src/main/resources"/>
<copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
@@ -151,33 +141,6 @@
<pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
</target>
- <target name="configure-project-6" if="jbossws.integration.jboss60">
- <mkdir dir="${project.home}/src/main/java"/>
- <mkdir dir="${project.home}/src/main/resources"/>
- <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
- <filterset refid="project"/>
- </copy>
- <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/>
- <path id="project.classpath">
- <pathelement location="${jboss.client}/jaxws-api.jar"/>
- <pathelement location="${jboss.client}/jsr181-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jbossws-api.jar"/>
- <pathelement location="${jboss.client}/jbossws-common.jar"/>
- <pathelement location="${jboss.client}/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/jaxrpc-api.jar"/>
- <pathelement location="${jboss.client}/saaj-api.jar"/>
- <pathelement location="${jboss.client}/jbossws-native-factories.jar"/>
- <pathelement location="${jboss.client}/jbossws-native-core.jar"/>
- <pathelement location="${jboss.client}/jbossws-native-services.jar"/>
- <pathelement location="${jboss.client}/jbossws-native-client.jar"/>
- <path refid="integration.target.javac.classpath" />
- </path>
- <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />
- <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" />
- <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
- </target>
-
<target name="delete-project" depends="validate-settings" description="Delete the configured user project">
<echo message="Deleting the entire project in ${project.home}" />
<delete dir="${project.home}" />
Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -34,33 +34,15 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <property name="jboss600.lib" value="${jboss600.home}/lib"/>
- <property name="jboss600.client" value="${jboss600.home}/client"/>
- <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
- <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
- <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
- <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
-
- <property name="jboss610.lib" value="${jboss610.home}/lib"/>
- <property name="jboss610.client" value="${jboss610.home}/client"/>
- <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
- <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
- <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
- <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
-
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/>
<property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
- <available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss610.available" file="${jboss610.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
<available property="jboss701.available" file="${jboss701.available.file}"/>
<available property="jboss702.available" file="${jboss702.available.file}"/>
Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -35,8 +35,6 @@
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/>
- <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/>
<property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
@@ -60,12 +58,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss60" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss700" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
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-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -7,18 +7,6 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
- <!-- bin -->
- <fileSet>
- <directory>../resources/src/main/resources/bin</directory>
- <outputDirectory>deploy-artifacts/bin</outputDirectory>
- <includes>
- <include>wsconsume.*</include>
- <include>wsprovide.*</include>
- <include>wsrunclient.*</include>
- <include>wstools.*</include>
- </includes>
- </fileSet>
-
<!-- resources -->
<fileSet>
<directory>../core/target/resources</directory>
@@ -37,15 +25,6 @@
</includes>
</fileSet>
- <!-- management console and port component link servlet -->
- <fileSet>
- <directory>./management/target</directory>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <includes>
- <include>jbossws-native-management.war</include>
- </includes>
- </fileSet>
-
</fileSets>
<dependencySets>
@@ -90,8 +69,6 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss600:jar</include>
- <include>org.jboss.ws:jbossws-jboss610:jar</include>
<include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client!
/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/com!
mons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*.!
jar lib/
endorsed/*jaxws*.jar
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -24,194 +24,7 @@
<project>
- <!--
- These patterns should be common for all supported containers.
- -->
- <patternset id="jbossws.bin.patternset">
- <include name="**/wsconsume.bat"/>
- <include name="**/wsconsume.sh"/>
- <include name="**/wsprovide.bat"/>
- <include name="**/wsprovide.sh"/>
- <include name="**/wsrunclient.bat"/>
- <include name="**/wsrunclient.sh"/>
- <include name="**/wstools.bat"/>
- <include name="**/wstools.sh"/>
- </patternset>
-
- <patternset id="jbossws.client.patternset">
- <include name="**/commons-beanutils.jar"/>
- <include name="**/FastInfoset.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/jsr181-api.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/jaxb-xjc.jar"/>
- <include name="**/jaxws-tools.jar"/>
- <include name="**/jaxws-rt.jar"/>
- <include name="**/policy.jar"/>
- <include name="**/jbossws-api.jar"/>
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-common-tools.jar"/>
- <include name="**/jbossws-native-client.jar"/>
- <include name="**/jbossws-native-core.jar"/>
- <include name="**/jbossws-native-services.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/jaxrpc-api.jar"/>
- <include name="**/saaj-api.jar"/>
- <include name="**/jettison.jar"/>
- <include name="**/netty.jar"/>
- <include name="**/wscommons-policy.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/stax-ex.jar"/>
- <include name="**/streambuffer.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/wstx.jar"/>
- </patternset>
-
- <patternset id="jbossws.lib.patternset">
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </patternset>
-
- <patternset id="jbossws.lib.endorsed.patternset">
- <include name="**/jbossws-native-factories.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/stax-api.jar"/>
- </patternset>
-
- <patternset id="jbossws.server.lib.patternset">
- <include name="**/commons-beanutils.jar"/>
- <include name="**/FastInfoset.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/jsr181-api.jar"/>
- <include name="**/jboss-jaxb-intros.jar"/>
- <include name="**/jbossws-api.jar"/>
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-native-core.jar"/>
- <include name="**/jaxrpc-api.jar"/>
- <include name="**/netty.jar"/>
- <include name="**/saaj-api.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/jettison.jar"/>
- <include name="**/netty.jar"/>
- <include name="**/wscommons-policy.jar"/>
- <include name="**/xmlsec.jar"/>
- </patternset>
-
- <patternset id="jbossws.service.lib.patternset">
- <include name="**/jbossws-native-factories.jar"/>
- <include name="**/jbossws-native-services.jar"/>
- </patternset>
-
<!-- ================================================================== -->
- <!-- Deploy Bin -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-bin">
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/bin">
- <patternset refid="jbossws.bin.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Lib -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-lib">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Lib Endorsed -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-endorsed">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Client -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-client">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- </fileset>
- </copy>
- <condition property="patch.jboss.metadata" value="true">
- <or>
- <equals arg1="${jbossid}" arg2="jboss501"/>
- <equals arg1="${jbossid}" arg2="jboss510"/>
- </or>
- </condition>
- <antcall target="modify-jboss-metadata">
- <param name="targetdir" value="@{targetdir}"/>
- <param name="thirdpartydir" value="@{thirdpartydir}"/>
- </antcall>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Server Lib -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-server-lib">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- <include name="**/jbossws-${jbossid}.jar"/>
- </fileset>
- </copy>
- <condition property="patch.jboss.metadata" value="true">
- <or>
- <equals arg1="${jbossid}" arg2="jboss501"/>
- <equals arg1="${jbossid}" arg2="jboss510"/>
- </or>
- </condition>
- <antcall target="modify-jboss-metadata">
- <param name="targetdir" value="@{targetdir}"/>
- <param name="thirdpartydir" value="@{thirdpartydir}"/>
- </antcall>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy JUDDI Service -->
<!-- ================================================================== -->
@@ -235,61 +48,6 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy JBossWS Console -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployment">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
-
- <!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <antcall target="modify-jboss-integration">
- <param name="targetdir" value="@{targetdir}"/>
- </antcall>
- </sequential>
- </macrodef>
-
- <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration">
- <sequential>
- <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer">
- <include name="**/stack-agnostic-jboss-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </target>
-
- <!-- ================================================================== -->
<!-- Modules -->
<!-- ================================================================== -->
@@ -432,17 +190,6 @@
<fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/>
</target>
- <target name="deploy-jbossws-native" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-native-modules">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
@@ -480,57 +227,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-undeploy-jbossws">
- <attribute name="defaultconf"/>
- <attribute name="defaultserverconf"/>
- <attribute name="targetdir"/>
- <attribute name="modifyjbossintegration"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
- <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.server.deploy.conf" srcfile="@{defaultserverconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}"/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.server.home}">
- <include name="**/juddi-service.sar/**"/>
- <include name="**/jbossws-console.war/**"/>
- <include name="**/jbossws.sar/**"/>
- </fileset>
- </delete>
- <antcall target="remove-jboss-integration">
- <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
- </antcall>
-
- <!-- delete content of last deployment -->
- <delete verbose="true">
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
- <delete verbose="true">
- <fileset dir="${jboss.server.home}" includes="${jbossws.server.deploy.conf}"/>
- </delete>
- </sequential>
- </macrodef>
-
- <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration">
- <delete verbose="true">
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/common">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- </delete>
- </target>
-
<target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration">
<delete verbose="true">
<fileset dir="${jboss.modules}">
@@ -547,17 +243,4 @@
</condition>
</target>
- <target name="modify-jboss-metadata" if="patch.jboss.metadata">
- <sequential>
- <copy
- tofile="${targetdir}/jboss-metadata.jar"
- failonerror="false"
- overwrite="true">
- <fileset dir="${thirdpartydir}">
- <include name="**/jbossws-${jbossid}-metadata.jar"/>
- </fileset>
- </copy>
- </sequential>
- </target>
-
</project>
Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1 +0,0 @@
-deployers/jbossws.deployer/jbossws-cxf-*.jar deployers/jbossws.deployer/FastInfoset.jar deployers/jbossws.deployer/jboss-jaxb-intros.jar deployers/jbossws.deployer/jbossws-common.jar deployers/jbossws.deployer/jbossws-framework.jar deployers/jbossws.deployer/jbossws-native-core.jar deployers/jbossws.deployer/jbossws-native-factories.jar deployers/jbossws.deployer/jbossws-native-services.jar deployers/jbossws.deployer/jettison.jar deployers/jbossws.deployer/netty.jar deployers/jbossws.deployer/wscommons-policy.jar deployers/jbossws.deployer/policy.jar deployers/jbossws.deployer/wsdl4j.jar deployers/jbossws.deployer/xmlsec.jar deployers/jbossws.deployer/META-INF/jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml deployers/jbossws.deployer/META-INF/standard-*-config.xml deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml
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-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -266,14 +266,6 @@
<include name="jboss.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1988-config.sar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1988/META-INF">
- <include name="jboss-service.xml" />
- <include name="login-config.xml" />
- <include name="jbossws-users.properties" />
- <include name="jbossws-roles.properties" />
- </metainf>
- </jar>
<!-- jaxws-jbws1991 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1991.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1991/META-INF/MANIFEST.MF">
@@ -366,14 +358,6 @@
<include name="bob-sign.jks" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2116-config.sar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/META-INF">
- <include name="jboss-service.xml" />
- <include name="login-config.xml" />
- <include name="keystore.jks" />
- <include name="jbossws-roles.properties" />
- </metainf>
- </jar>
<!-- jaxws-jbws2166-->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-A.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -49,28 +49,20 @@
public static Test suite() throws Exception
{
JBossWSTestSetup testSetup;
- if (!isTargetJBoss6())
- {
- testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.jar");
- Map<String, String> authenticationOptions = new HashMap<String, String>();
- authenticationOptions.put("usersProperties",
- getResourceFile("jaxws/jbws1988/META-INF/jbossws-users.properties").getAbsolutePath());
- authenticationOptions.put("rolesProperties",
- getResourceFile("jaxws/jbws1988/META-INF/jbossws-roles.properties").getAbsolutePath());
- authenticationOptions.put("hashAlgorithm", "SHA");
- authenticationOptions.put("hashEncoding", "BASE64");
- authenticationOptions.put("hashCharset", "UTF-8");
- authenticationOptions.put("hashUserPassword", "false");
- authenticationOptions.put("hashStorePassword", "true");
- authenticationOptions.put("storeDigestCallback", "org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback");
- authenticationOptions.put("unauthenticatedIdentity", "anonymous");
- testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
- }
- else
- {
- testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class,
- "jaxws-jbws1988-config.sar jaxws-jbws1988.jar");
- }
+ testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.jar");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties",
+ getResourceFile("jaxws/jbws1988/META-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/jbws1988/META-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("hashAlgorithm", "SHA");
+ authenticationOptions.put("hashEncoding", "BASE64");
+ authenticationOptions.put("hashCharset", "UTF-8");
+ authenticationOptions.put("hashUserPassword", "false");
+ authenticationOptions.put("hashStorePassword", "true");
+ authenticationOptions.put("storeDigestCallback", "org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback");
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
return testSetup;
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.jbws1991;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -46,7 +45,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar", !isTargetJBoss6());
+ return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar", true);
}
public void testAuth() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -56,7 +56,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war", !isTargetJBoss6());
+ return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war", true);
}
public void testNoSecurity() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -55,22 +55,14 @@
public static Test suite() throws Exception
{
JBossWSTestSetup testSetup;
- if (!isTargetJBoss6())
- {
- testSetup = new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116.jar");
- Map<String, String> authenticationOptions = new HashMap<String, String>();
- authenticationOptions.put("rolesProperties",
- getResourceFile("jaxws/jbws2116/META-INF/jbossws-roles.properties").getAbsolutePath());
- authenticationOptions.put("KeyStoreURL", "jaxws/jbws2116/META-INF/keystore.jks");
- authenticationOptions.put("KeyStorePass", "password");
- authenticationOptions.put("unauthenticatedIdentity", "anonymous");
- testSetup.addSecurityDomainRequirement("JBossWSCert", authenticationOptions);
- }
- else
- {
- testSetup = new JBossWSTestSetup(CertAuthTestCase.class,
- "jaxws-jbws2116-config.sar jaxws-jbws2116.jar");
- }
+ testSetup = new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116.jar");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/jbws2116/META-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("KeyStoreURL", "jaxws/jbws2116/META-INF/keystore.jks");
+ authenticationOptions.put("KeyStorePass", "password");
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSCert", authenticationOptions);
return testSetup;
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -41,7 +41,7 @@
return new JBossWSTestSetup
(
SecureNewsTestCase.class,
- "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar", !isTargetJBoss6()
+ "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar", true
);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.wssecurity;
-import java.io.File;
import java.io.StringReader;
import java.net.URL;
import java.util.Map;
@@ -59,7 +58,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", !isTargetJBoss6());
+ return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", true);
}
@Override
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -47,7 +47,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", !isTargetJBoss6());
+ return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", true);
}
@Override
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1,64 +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.tools.scripts;
-
-import java.io.File;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * JBWS-1793: Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
- *
- * @author Heiko.Braun(a)jboss.com
- */
-public class ScriptTestCase extends JBossWSTest
-{
- private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
- private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
- private String TOOLS_CONFIG = getResourceFile("tools" + FS + "scripts" + FS + "wstools-config.xml").getAbsolutePath();
- private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
-
- private String JBOSS_HOME;
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- JBOSS_HOME = System.getProperty("jboss.home");
- }
-
- public void testWSToolsFromCommandLine() throws Exception
- {
- if (!isTargetJBoss6()) return; // wstools.sh(.bat) not available since AS7
-
- // use absolute path for the output to be re-usable
- File dest = createResourceFile("wstools" + FS + "java");
- dest.mkdirs();
-
- String command = JBOSS_HOME + FS + "bin" + FS + "wstools" + EXT + " -config " + TOOLS_CONFIG + " -dest "+ dest.getAbsolutePath();
- executeCommand(command);
-
- File javaSource = getResourceFile("wstools" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jbws810" + FS + "PhoneBookService.java");
-
- assertTrue("Service endpoint interface not generated", javaSource.exists());
- }
-
-}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
- <!-- ==================================================================== -->
- <!-- Dynamic login config to install the login module using digest -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="jboss:service=DynamicLoginConfig">
- <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
- <!-- The service which supports dynamic processing of login-config.xml
- configurations.
- -->
- <depends optional-attribute-name="LoginConfigService">
- jboss.security:service=XMLLoginConfig
- </depends>
- <!-- Optionally specify the security mgr service to use when
- this service is stopped to flush the auth caches of the domains
- registered by this service.
- -->
- <depends optional-attribute-name="SecurityManagerService">
- jboss.security:service=JaasSecurityManager
- </depends>
- </mbean>
-</server>
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1,25 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<policy>
-
- <application-policy name="JBossWSDigest">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option>
- <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option>
- <module-option name="hashAlgorithm">SHA</module-option>
- <module-option name="hashEncoding">BASE64</module-option>
- <module-option name="hashUserPassword">false</module-option>
- <module-option name="hashStorePassword">true</module-option>
- <module-option name="storeDigestCallback">org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback</module-option>
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
-</policy>
-
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
- <!-- ==================================================================== -->
- <!-- JassSecurityDomain required to use CertRolesLoginModule -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
- name="jboss.security:service=SecurityDomain">
- <constructor>
- <arg type="java.lang.String" value="JBossWSCert"/>
- </constructor>
- <attribute name="KeyStoreURL">resource:META-INF/keystore.jks</attribute>
- <attribute name="KeyStorePass">password</attribute>
- <depends>jboss.security:service=JaasSecurityManager</depends>
- </mbean>
- <!-- ==================================================================== -->
- <!-- Dynamic login config to install the CertRolesLoginModule -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="jboss:service=DynamicLoginConfig">
- <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
- <!-- The service which supports dynamic processing of login-config.xml
- configurations.
- -->
- <depends optional-attribute-name="LoginConfigService">
- jboss.security:service=XMLLoginConfig
- </depends>
- <!-- Optionally specify the security mgr service to use when
- this service is stopped to flush the auth caches of the domains
- registered by this service.
- -->
- <depends optional-attribute-name="SecurityManagerService">
- jboss.security:service=JaasSecurityManager
- </depends>
- </mbean>
-</server>
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -1,20 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<policy>
-
- <application-policy name="JBossWSCert">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.CertRolesLoginModule"
- flag="required">
- <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option>
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- <module-option name="securityDomain">java:/jaas/JBossWSCert</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
-</policy>
-
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -24,7 +24,6 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
- <hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
<hornetq.version>2.1.0.BETA3</hornetq.version>
<log4j.output.dir>${project.build.directory}</log4j.output.dir>
@@ -272,10 +271,6 @@
<value>jnp://${jboss.bind.address}:1099</value>
</property>
<property>
- <name>jboss.server.instance</name>
- <value>${jboss.server.instance}</value>
- </property>
- <property>
<name>java.protocol.handler.pkgs</name>
<value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value>
</property>
@@ -427,312 +422,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jboss.version>6.0.0.Final</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- <version>${jboss.version}</version>
- <exclusions>
- <!-- Exclusion for not depending on the container integration -->
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Exclude Sun's stax implementation : com.sun.xml.stream:sjsxp:jar:1.0.1 -->
- <exclusion>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
- <excludes>
- <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
-
- <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
- <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
- <!-- # [JBWS-3150] This test causes hudson to freeze -->
- <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
-
- <!-- # [JBWS-3252] Investigate WSA interop tests regression -->
- <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
-
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
-
- <!-- # [JBWS-3026] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
- <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!-- # [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss610
- Descr: JBoss-6.1.0 specific options
- -->
- <profile>
- <id>jboss610</id>
- <properties>
- <jboss.version>6.1.0.Final</jboss.version>
- <jbossws.integration.target>jboss610</jbossws.integration.target>
- <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- <!-- Exclusion for not depending on the container integration -->
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Exclude Sun's stax implementation : com.sun.xml.stream:sjsxp:jar:1.0.1 -->
- <exclusion>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
- <excludes>
- <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
-
- <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
- <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
- <!-- # [JBWS-3150] This test causes hudson to freeze -->
- <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
-
- <!-- # [JBWS-3252] Investigate WSA interop tests regression -->
- <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
-
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
-
- <!-- # [JBWS-3026] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
- <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!-- # [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss700
Descr: JBoss-7.0.0.Final specific options
-->
@@ -1555,26 +1244,7 @@
</properties>
</profile>
- <!--
- Name: no-jboss-server-instance
- Descr: Set the default jboss.server.instance
-
- command line cannot overwrite pom properties
- http://jira.codehaus.org/browse/MNG-3546
- -->
<profile>
- <id>no-jboss-server-instance</id>
- <activation>
- <property>
- <name>!jboss.server.instance</name>
- </property>
- </activation>
- <properties>
- <jboss.server.instance>default</jboss.server.instance>
- </properties>
- </profile>
-
- <profile>
<id>default-mgmt-security</id>
<activation>
<property>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-12-15 09:35:07 UTC (rev 15391)
+++ stack/native/trunk/pom.xml 2011-12-15 09:38:13 UTC (rev 15392)
@@ -62,8 +62,6 @@
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
- <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.0-SNAPSHOT</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.0-SNAPSHOT</jbossws.jboss702.version>
@@ -122,30 +120,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss700</artifactId>
<version>${jbossws.jboss700.version}</version>
</dependency>
@@ -577,30 +551,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss610
- Descr: JBoss-6.1.0 specific options
- -->
- <profile>
- <id>jboss610</id>
- <properties>
- <jbossws.integration.target>jboss610</jbossws.integration.target>
- <jboss.home>${jboss610.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss700
Descr: JBoss-7.0.0 specific options
-->
12 years, 9 months