JBossWS SVN: r6514 - in container/jboss42/branches/jbossws-jboss422: src and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 13:28:07 -0400 (Fri, 18 Apr 2008)
New Revision: 6514
Removed:
container/jboss42/branches/jbossws-jboss422/src/etc/
Modified:
container/jboss42/branches/jbossws-jboss422/pom.xml
container/jboss42/branches/jbossws-jboss422/src/main/assembly/src.xml
Log:
Fix missing META-INF/services
Modified: container/jboss42/branches/jbossws-jboss422/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 17:09:22 UTC (rev 6513)
+++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 17:28:07 UTC (rev 6514)
@@ -180,6 +180,9 @@
<directory>src/main/etc</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>src/main/resources/jbossws-jboss42.jar</directory>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: container/jboss42/branches/jbossws-jboss422/src/main/assembly/src.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/assembly/src.xml 2008-04-18 17:09:22 UTC (rev 6513)
+++ container/jboss42/branches/jbossws-jboss422/src/main/assembly/src.xml 2008-04-18 17:28:07 UTC (rev 6514)
@@ -10,7 +10,6 @@
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>jbossws-jboss42.jar/**</include>
<include>jbossws-jboss42.sar/**</include>
<include>jbossws-jboss42-config.xml</include>
</includes>
16 years, 9 months
JBossWS SVN: r6513 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 13:09:22 -0400 (Fri, 18 Apr 2008)
New Revision: 6513
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Imporove exception on invalid jboss.integration.target
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 17:00:46 UTC (rev 6512)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 17:09:22 UTC (rev 6513)
@@ -212,7 +212,7 @@
}
if (integrationTarget.startsWith(jbossVersion) == false)
- throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ") == false");
+ throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")");
}
return integrationTarget;
}
16 years, 9 months
JBossWS SVN: r6512 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 13:00:46 -0400 (Fri, 18 Apr 2008)
New Revision: 6512
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Imporove exception on invalid jboss.integration.target
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 16:57:56 UTC (rev 6511)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 17:00:46 UTC (rev 6512)
@@ -189,7 +189,7 @@
integrationTarget = System.getProperty(SYSPROP_JBOSSWS_INTEGRATION_TARGET);
if (integrationTarget == null)
- throw new IllegalStateException("Cannot obtain jbossws.integration.target");
+ throw new IllegalStateException("Cannot obtain system property: " + SYSPROP_JBOSSWS_INTEGRATION_TARGET);
// Read the JBoss SpecificationVersion
String jbossVersion = null;
16 years, 9 months
JBossWS SVN: r6511 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 12:57:56 -0400 (Fri, 18 Apr 2008)
New Revision: 6511
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Imporove exception on invalid jboss.integration.target
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 16:50:32 UTC (rev 6510)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 16:57:56 UTC (rev 6511)
@@ -211,8 +211,8 @@
// ignore, we are not running on jboss-4.2 or greater
}
- if (jbossVersion != null && integrationTarget.startsWith(jbossVersion) == false)
- throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
+ if (integrationTarget.startsWith(jbossVersion) == false)
+ throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ") == false");
}
return integrationTarget;
}
16 years, 9 months
JBossWS SVN: r6510 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 12:50:32 -0400 (Fri, 18 Apr 2008)
New Revision: 6510
Modified:
common/trunk/.classpath
Log:
eclipse classpath
Modified: common/trunk/.classpath
===================================================================
--- common/trunk/.classpath 2008-04-18 16:18:11 UTC (rev 6509)
+++ common/trunk/.classpath 2008-04-18 16:50:32 UTC (rev 6510)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
16 years, 9 months
JBossWS SVN: r6509 - container/jboss42/branches/jbossws-jboss422.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 12:18:11 -0400 (Fri, 18 Apr 2008)
New Revision: 6509
Modified:
container/jboss42/branches/jbossws-jboss422/pom.xml
Log:
Exclude invalid jbossxb dependencies
Modified: container/jboss42/branches/jbossws-jboss422/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 16:01:56 UTC (rev 6508)
+++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 16:18:11 UTC (rev 6509)
@@ -149,11 +149,20 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${jbossxb.version}</version>
+ <!-- dependencies not in sync with jboss-4.2.2 -->
<exclusions>
<exclusion>
<groupId>jboss.common.core</groupId>
<artifactId>jboss-common-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.logging.log4j</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
16 years, 9 months
JBossWS SVN: r6508 - stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-18 12:01:56 -0400 (Fri, 18 Apr 2008)
New Revision: 6508
Modified:
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
Log:
removing useless code and unused imports
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-18 15:56:34 UTC (rev 6507)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-18 16:01:56 UTC (rev 6508)
@@ -39,7 +39,7 @@
import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
/**
- * A deployer that locates or generates cxf.xml
+ * A deployer that locates or generates CXF configuration file
*
* @author Thomas.Diesler(a)jboss.org
* @since 10-May-2007
@@ -65,16 +65,12 @@
@Override
public void create(Deployment dep, WSFRuntime runtime)
{
- URL cxfURL = getCXFConfigFromClassLoader(dep);
+ URL cxfURL = getCXFConfigFromDeployment(dep);
if (cxfURL == null)
{
- cxfURL = getCXFConfigFromDeployment(dep);
- if (cxfURL == null)
- {
- cxfURL = generateCXFConfigFromDeployment(dep);
- }
- putCXFConfigToDeployment(dep, cxfURL);
+ cxfURL = generateCXFConfigFromDeployment(dep);
}
+ putCXFConfigToDeployment(dep, cxfURL);
}
@Override
@@ -88,22 +84,6 @@
}
/**
- * Looks for <b>cxf.xml</b> in classloader
- * @param dep deployment which initial classloader will be used
- * @return <b>cxf.xml URL</b> or <b>null</b> if not found
- */
- private static URL getCXFConfigFromClassLoader(Deployment dep)
- {
- ClassLoader initCL = dep.getInitialClassLoader();
- URL cxfURL = initCL.getResource("cxf.xml");
- if (cxfURL != null)
- {
- log.info("CXF configuration found: " + cxfURL);
- }
- return cxfURL;
- }
-
- /**
* Looks for <b>jbossws-cxf.xml</b> in:
* <ul>
* <li><b>META-INF</b> resource directory for EJB3 deployment</li>
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-18 15:56:34 UTC (rev 6507)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-18 16:01:56 UTC (rev 6508)
@@ -23,7 +23,6 @@
//$Id$
-import java.io.IOException;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
16 years, 9 months
JBossWS SVN: r6507 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 11:56:34 -0400 (Fri, 18 Apr 2008)
New Revision: 6507
Modified:
framework/trunk/.classpath
Log:
eclipse classpath
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-18 15:42:56 UTC (rev 6506)
+++ framework/trunk/.classpath 2008-04-18 15:56:34 UTC (rev 6507)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="framework/target/classes" path="framework/src/main/java"/>
- <classpathentry kind="src" output="framework/target/test-classes" path="framework/src/test/java">
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="maven.type" value="test"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="framework/src/main/etc" path="framework/src/main/etc"/>
- <classpathentry excluding="**" kind="src" output="framework/src/test/resources" path="framework/src/test/resources"/>
+ <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/>
+ <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
16 years, 9 months
JBossWS SVN: r6506 - container/jboss42/branches/jbossws-jboss422.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 11:42:56 -0400 (Fri, 18 Apr 2008)
New Revision: 6506
Modified:
container/jboss42/branches/jbossws-jboss422/.project
container/jboss42/branches/jbossws-jboss422/pom.xml
Log:
Revert back to jbossws-jboss42 until we have a 423 issue
Modified: container/jboss42/branches/jbossws-jboss422/.project
===================================================================
--- container/jboss42/branches/jbossws-jboss422/.project 2008-04-18 15:31:04 UTC (rev 6505)
+++ container/jboss42/branches/jbossws-jboss422/.project 2008-04-18 15:42:56 UTC (rev 6506)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws-jboss422</name>
+ <name>jbossws-jboss42</name>
<comment></comment>
<projects>
</projects>
Modified: container/jboss42/branches/jbossws-jboss422/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 15:31:04 UTC (rev 6505)
+++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 15:42:56 UTC (rev 6506)
@@ -4,7 +4,7 @@
<name>JBoss Web Services - Container JBoss-4.2.2</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
+ <artifactId>jbossws-jboss42</artifactId>
<version>4.2.2-SNAPSHOT</version>
16 years, 9 months
JBossWS SVN: r6505 - container/jboss42/branches/jbossws-jboss422.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 11:31:04 -0400 (Fri, 18 Apr 2008)
New Revision: 6505
Modified:
container/jboss42/branches/jbossws-jboss422/.project
container/jboss42/branches/jbossws-jboss422/pom.xml
Log:
artifactId=jbossws-jboss422
Modified: container/jboss42/branches/jbossws-jboss422/.project
===================================================================
--- container/jboss42/branches/jbossws-jboss422/.project 2008-04-18 15:20:32 UTC (rev 6504)
+++ container/jboss42/branches/jbossws-jboss422/.project 2008-04-18 15:31:04 UTC (rev 6505)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws-jboss42</name>
+ <name>jbossws-jboss422</name>
<comment></comment>
<projects>
</projects>
Modified: container/jboss42/branches/jbossws-jboss422/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 15:20:32 UTC (rev 6504)
+++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 15:31:04 UTC (rev 6505)
@@ -4,7 +4,7 @@
<name>JBoss Web Services - Container JBoss-4.2.2</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
+ <artifactId>jbossws-jboss422</artifactId>
<version>4.2.2-SNAPSHOT</version>
16 years, 9 months