wise SVN: r393 - in core/trunk: core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative and 2 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 13:28:37 -0400 (Sat, 04 Sep 2010)
New Revision: 393
Added:
core/trunk/core-native/src/main/resources/META-INF/services/
core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate
Removed:
core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate
Modified:
core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java
core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java
core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java
core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java
Log:
[WISE-169] Fixing position of EnablerDelegate service configuration in produced artifact, adding setConfigName/File methods to EnablerDelegate interface for allowing concrete implementations to be retrieved via Service API
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java 2010-09-04 16:57:41 UTC (rev 392)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java 2010-09-04 17:28:37 UTC (rev 393)
@@ -38,6 +38,24 @@
/**
* {@inheritDoc}
*
+ * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigFile(String)
+ */
+ public void setConfigFile(String configFile) {
+ //NOOP
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigName(String)
+ */
+ public void setConfigName(String configName) {
+ //NOOP
+ }
+
+ /**
+ * {@inheritDoc}
+ *
* @see org.jboss.wise.core.wsextensions.EnablerDelegate#visitMTOM(Object)
*/
public void visitMTOM( Object endpointInstance ) throws UnsupportedOperationException {
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java 2010-09-04 16:57:41 UTC (rev 392)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java 2010-09-04 17:28:37 UTC (rev 393)
@@ -41,7 +41,21 @@
public interface EnablerDelegate {
/**
+ * Sets the configFile to be used, if any
*
+ * @param configFile
+ */
+ public void setConfigFile(String configFile);
+
+ /**
+ * Sets the configName to be used, if any
+ *
+ * @param configName
+ */
+ public void setConfigName(String configName);
+
+ /**
+ *
* @param endpointInstance
* @throws UnsupportedOperationException
* @throws IllegalStateException
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java 2010-09-04 16:57:41 UTC (rev 392)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java 2010-09-04 17:28:37 UTC (rev 393)
@@ -21,7 +21,7 @@
*/
package org.jboss.wise.core.wsextensions;
-import org.jboss.wsf.spi.util.ServiceLoader;
+import org.jboss.wise.core.client.SpiLoader;
/**
@@ -35,6 +35,9 @@
public static EnablerDelegate newEnablerDelegate(String configFile, String configName)
{
- return (EnablerDelegate)ServiceLoader.loadService(EnablerDelegate.class.getName(), DefaultEnablerDelegate.class.getName());
+ EnablerDelegate ed = (EnablerDelegate)SpiLoader.loadService(EnablerDelegate.class.getName(), DefaultEnablerDelegate.class.getName());
+ ed.setConfigFile(configFile);
+ ed.setConfigName(configName);
+ return ed;
}
}
Modified: core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java
===================================================================
--- core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java 2010-09-04 16:57:41 UTC (rev 392)
+++ core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java 2010-09-04 17:28:37 UTC (rev 393)
@@ -45,8 +45,12 @@
@Immutable
public class ReflectionEnablerDelegate extends DefaultEnablerDelegate {
- private final String configFileURL;
- private final String configName;
+ private String configFileURL;
+ private String configName;
+
+ public ReflectionEnablerDelegate() {
+ super();
+ }
/**
* @param configFileURL
@@ -58,6 +62,24 @@
this.configFileURL = configFileURL;
this.configName = configName;
}
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigFile(String)
+ */
+ public void setConfigFile(String configFile) {
+ this.configFileURL = configFile;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigName(String)
+ */
+ public void setConfigName(String configName) {
+ this.configName = configName;
+ }
/**
* {@inheritDoc}
Deleted: core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate
===================================================================
--- core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-09-04 16:57:41 UTC (rev 392)
+++ core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-09-04 17:28:37 UTC (rev 393)
@@ -1 +0,0 @@
-org.jboss.wise.core.wsextensions.impl.jbosswsnative.ReflectionEnablerDelegate
\ No newline at end of file
Added: core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate
===================================================================
--- core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate (rev 0)
+++ core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-09-04 17:28:37 UTC (rev 393)
@@ -0,0 +1 @@
+org.jboss.wise.core.wsextensions.impl.jbosswsnative.ReflectionEnablerDelegate
\ No newline at end of file
13 years, 9 months
wise SVN: r392 - in core/trunk: integration/src/test/resources and 1 other directory.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 12:57:41 -0400 (Sat, 04 Sep 2010)
New Revision: 392
Modified:
core/trunk/core/src/test/resources/test-log4j.xml
core/trunk/integration/src/test/resources/integration-test-log4j.xml
Log:
Creating log files in target folders
Modified: core/trunk/core/src/test/resources/test-log4j.xml
===================================================================
--- core/trunk/core/src/test/resources/test-log4j.xml 2010-09-04 16:53:47 UTC (rev 391)
+++ core/trunk/core/src/test/resources/test-log4j.xml 2010-09-04 16:57:41 UTC (rev 392)
@@ -6,7 +6,7 @@
<appender name="FILE" class="org.apache.log4j.FileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="test.log"/>
+ <param name="File" value="target/test.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
@@ -26,4 +26,4 @@
<appender-ref ref="FILE"/>
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: core/trunk/integration/src/test/resources/integration-test-log4j.xml
===================================================================
--- core/trunk/integration/src/test/resources/integration-test-log4j.xml 2010-09-04 16:53:47 UTC (rev 391)
+++ core/trunk/integration/src/test/resources/integration-test-log4j.xml 2010-09-04 16:57:41 UTC (rev 392)
@@ -6,7 +6,7 @@
<appender name="FILE" class="org.apache.log4j.FileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="integration-test.log"/>
+ <param name="File" value="target/integration-test.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
@@ -26,4 +26,4 @@
<appender-ref ref="FILE"/>
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
13 years, 9 months
wise SVN: r391 - in core/trunk: integration and 1 other directory.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 12:53:47 -0400 (Sat, 04 Sep 2010)
New Revision: 391
Modified:
core/trunk/core/
core/trunk/integration/
Log:
Setting proper svn:ignore props on integration and core module, for ingoring custom Eclipse settings
Property changes on: core/trunk/core
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: core/trunk/integration
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
13 years, 9 months
wise SVN: r390 - in core/trunk: integration and 1 other directory.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 12:51:23 -0400 (Sat, 04 Sep 2010)
New Revision: 390
Removed:
core/trunk/core/.classpath
core/trunk/core/.project
core/trunk/core/.settings/
core/trunk/integration/.classpath
core/trunk/integration/.project
core/trunk/integration/.settings/
Log:
Removing Eclipse proprietary files from SCM as they're not required anymore with recent Eclipse and Subversion versions (just do Import->Existing project into workspace -> Maven Project)
Deleted: core/trunk/core/.classpath
===================================================================
--- core/trunk/core/.classpath 2010-09-04 16:38:26 UTC (rev 389)
+++ core/trunk/core/.classpath 2010-09-04 16:51:23 UTC (rev 390)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: core/trunk/core/.project
===================================================================
--- core/trunk/core/.project 2010-09-04 16:38:26 UTC (rev 389)
+++ core/trunk/core/.project 2010-09-04 16:51:23 UTC (rev 390)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>wise-core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
Deleted: core/trunk/integration/.classpath
===================================================================
--- core/trunk/integration/.classpath 2010-09-04 16:38:26 UTC (rev 389)
+++ core/trunk/integration/.classpath 2010-09-04 16:51:23 UTC (rev 390)
@@ -1,78 +0,0 @@
-<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/dtdparser/dtdparser/1.21/dtdparser-1.21.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/fastinfoset/FastInfoset/1.2.2/FastInfoset-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1.9/jaxb-xjc-2.1.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/ws/jaxws-rt/2.1.3/jaxws-rt-2.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/ws/jaxws-tools/2.1.3/jaxws-tools-2.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-container/2.0.0.Beta/jboss-container-2.0.0.Beta.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-dependency/2.0.0.Beta/jboss-dependency-2.0.0.Beta.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.0.GA/jboss-jaxb-intros-1.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-kernel/2.0.0.Beta/jboss-kernel-2.0.0.Beta.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.0.SP2/jboss-remoting-2.5.0.SP2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossws-client/2.0.1.SP2/jbossws-client-2.0.1.SP2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/1.0.8.GA/jbossws-common-1.0.8.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-client/3.0.5.GA/jbossws-native-client-3.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-core/3.0.5.GA/jbossws-native-core-3.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.5.GA/jbossws-native-jaxrpc-3.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.0.5.GA/jbossws-native-jaxws-3.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws-ext/3.0.5.GA/jbossws-native-jaxws-ext-3.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.5.GA/jbossws-native-saaj-3.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.1.0.GA/jbossws-spi-1.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossxb/1.0.0.CR8/jbossxb-1.0.0.CR8.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-commons/1.1/milyn-commons-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-core/1.1/milyn-smooks-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-javabean/1.1/milyn-smooks-javabean-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jvnet/mimepull/1.1/mimepull-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/1.3.12-java1.5/mvel-1.3.12-java1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/wscommons-policy/policy/1.0/policy-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/org/apache/xml/internal/resolver/20050927/resolver-20050927.jar"/>
- <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jvnet/staxex/stax-ex/1.2/stax-ex-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/buffer/streambuffer/0.7/streambuffer-0.7.jar"/>
- <classpathentry kind="lib" path="/home/jimma/java/jdk1.5.0_15/lib/tools.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="src" path="/wise-core"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-lgpl/3.2.6/wstx-lgpl-3.2.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-security/xmlsec/1.3.0/xmlsec-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
-</classpath>
\ No newline at end of file
Deleted: core/trunk/integration/.project
===================================================================
--- core/trunk/integration/.project 2010-09-04 16:38:26 UTC (rev 389)
+++ core/trunk/integration/.project 2010-09-04 16:51:23 UTC (rev 390)
@@ -1,19 +0,0 @@
-<projectDescription>
- <name>wise-integration</name>
- <comment/>
- <projects>
- <project>wise-core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
13 years, 9 months
wise SVN: r389 - in core/trunk/integration: src/test/java/org/jboss/wise/test/integration/wsaandwsse and 1 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 12:38:26 -0400 (Sat, 04 Sep 2010)
New Revision: 389
Added:
core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml
Removed:
core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/handlers.xml
Modified:
core/trunk/integration/pom.xml
core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java
Log:
[WISE-169] Fixing integration/pom.xml a bit by adding profile for core-native and using proper maven properties
Modified: core/trunk/integration/pom.xml
===================================================================
--- core/trunk/integration/pom.xml 2010-09-04 15:19:56 UTC (rev 388)
+++ core/trunk/integration/pom.xml 2010-09-04 16:38:26 UTC (rev 389)
@@ -60,12 +60,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>test</scope>
@@ -87,8 +81,8 @@
</goals>
<configuration>
<finalName>mtom-tests</finalName>
- <outputDirectory>${basedir}/target/test-classes/</outputDirectory>
- <testClassesDirectory>${basedir}/target/test-classes/</testClassesDirectory>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <testClassesDirectory>${project.build.directory}/test-classes/</testClassesDirectory>
<includes>
<include>**/mtom/*</include>
</includes>
@@ -111,18 +105,15 @@
<goal>war</goal>
</goals>
<configuration>
- <webXml>${basedir}/src/test/resources/WEB-INF/basic/web.xml
- </webXml>
+ <webXml>${basedir}/src/test/resources/WEB-INF/basic/web.xml</webXml>
<warName>basic</warName>
- <outputDirectory>${basedir}/target/test-classes/
- </outputDirectory>
- <webappDirectory>${basedir}/target/basic
- </webappDirectory>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/basic</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
<webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
- <directory>${basedir}/target/test-classes/
- </directory>
+ <directory>${basedir}/target/test-classes/</directory>
<includes>
<include>**/basic/*.class</include>
</includes>
@@ -141,19 +132,15 @@
<goal>war</goal>
</goals>
<configuration>
- <webXml>${basedir}/src/test/resources/WEB-INF/wsse/web.xml
- </webXml>
+ <webXml>${basedir}/src/test/resources/WEB-INF/wsse/web.xml</webXml>
<warName>wsse</warName>
- <outputDirectory>${basedir}/target/test-classes/
- </outputDirectory>
- <webappDirectory>${basedir}/target/wsse
- </webappDirectory>
- <packagingIncludes></packagingIncludes>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/wsse</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
<webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
- <directory>${basedir}/target/test-classes/
- </directory>
+ <directory>${basedir}/target/test-classes/</directory>
<includes>
<include>**/wsse/*.class</include>
</includes>
@@ -161,11 +148,9 @@
<exclude>**/*Test.class</exclude>
</excludes>
</webResource>
-
<webResource>
<targetPath>WEB-INF</targetPath>
- <directory>${basedir}/src/test/resources/WEB-INF/wsse/
- </directory>
+ <directory>${basedir}/src/test/resources/WEB-INF/wsse/</directory>
<includes>
<include>**/*.*</include>
</includes>
@@ -181,19 +166,15 @@
<goal>war</goal>
</goals>
<configuration>
- <webXml>${basedir}/src/test/resources/WEB-INF/wsdlResolver/web.xml
- </webXml>
+ <webXml>${basedir}/src/test/resources/WEB-INF/wsdlResolver/web.xml</webXml>
<warName>wsdlResolver</warName>
- <outputDirectory>${basedir}/target/test-classes/
- </outputDirectory>
- <webappDirectory>${basedir}/target/wsdlResolver
- </webappDirectory>
- <packagingIncludes></packagingIncludes>
- <webResources>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/wsdlResolver</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
+ <webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
- <directory>${basedir}/target/test-classes/
- </directory>
+ <directory>${basedir}/target/test-classes/</directory>
<includes>
<include>**/wsdlResolver/*.class</include>
</includes>
@@ -201,11 +182,9 @@
<exclude>**/*Test.class</exclude>
</excludes>
</webResource>
-
<webResource>
<targetPath>WEB-INF</targetPath>
- <directory>${basedir}/src/test/resources/WEB-INF/wsdlResolver/
- </directory>
+ <directory>${basedir}/src/test/resources/WEB-INF/wsdlResolver/</directory>
<includes>
<include>**/*.*</include>
</includes>
@@ -221,14 +200,11 @@
<goal>war</goal>
</goals>
<configuration>
- <webXml>${basedir}/src/test/resources/WEB-INF/wsa/web.xml
- </webXml>
+ <webXml>${basedir}/src/test/resources/WEB-INF/wsa/web.xml</webXml>
<warName>wsa</warName>
- <outputDirectory>${basedir}/target/test-classes/
- </outputDirectory>
- <webappDirectory>${basedir}/target/wsa
- </webappDirectory>
- <packagingIncludes></packagingIncludes>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/wsa</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
<webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
@@ -252,21 +228,18 @@
<goal>war</goal>
</goals>
<configuration>
- <webXml>${basedir}/src/test/resources/WEB-INF/wsaandwsse/web.xml
- </webXml>
+ <webXml>${basedir}/src/test/resources/WEB-INF/wsaandwsse/web.xml</webXml>
<warName>wsaandwsse</warName>
- <outputDirectory>${basedir}/target/test-classes/
- </outputDirectory>
- <webappDirectory>${basedir}/target/wsaandwsse
- </webappDirectory>
- <packagingIncludes></packagingIncludes>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/wsaandwsse</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
<webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
- <directory>${basedir}/target/test-classes/
- </directory>
+ <directory>${basedir}/target/test-classes/</directory>
<includes>
<include>**/wsaandwsse/*.class</include>
+ <include>**/wsaandwsse/handlers.xml</include>
</includes>
<excludes>
<exclude>**/*Test.class</exclude>
@@ -274,8 +247,7 @@
</webResource>
<webResource>
<targetPath>WEB-INF</targetPath>
- <directory>${basedir}/src/test/resources/WEB-INF/wsaandwsse/
- </directory>
+ <directory>${basedir}/src/test/resources/WEB-INF/wsaandwsse/</directory>
<includes>
<include>**/*.*</include>
</includes>
@@ -291,18 +263,15 @@
<goal>war</goal>
</goals>
<configuration>
- <webXml>${basedir}/src/test/resources/WEB-INF/smooks/web.xml
- </webXml>
+ <webXml>${basedir}/src/test/resources/WEB-INF/smooks/web.xml</webXml>
<warName>smooks</warName>
- <outputDirectory>${basedir}/target/test-classes/
- </outputDirectory>
- <webappDirectory>${basedir}/target/smooks
- </webappDirectory>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/smooks</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
<webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
- <directory>${basedir}/target/test-classes/
- </directory>
+ <directory>${basedir}/target/test-classes/</directory>
<includes>
<include>**/smooks/**/*.class</include>
</includes>
@@ -367,6 +336,26 @@
</build>
<profiles>
+
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>!cxf.stack</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.wise</groupId>
+ <artifactId>wise-core-native</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+
+
<profile>
<id>skip.tests</id>
<activation>
Modified: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java
===================================================================
--- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java 2010-09-04 15:19:56 UTC (rev 388)
+++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java 2010-09-04 16:38:26 UTC (rev 389)
@@ -27,7 +27,7 @@
@WebService(endpointInterface = "org.jboss.wise.test.integration.wsaandwsse.WSAandWSSE", targetNamespace = "http://org.jboss/wise/wssecurity", serviceName = "WSAandWSSEService")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
-@HandlerChain(file = "WEB-INF/handlers.xml")
+@HandlerChain(file = "handlers.xml")
public class WSAandWSSEImpl implements WSAandWSSE {
public String echoUserType(String user) {
return "Hello WSAddressingAndWSSecurity";
Added: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml
===================================================================
--- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml (rev 0)
+++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml 2010-09-04 16:38:26 UTC (rev 389)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>WSAddressing Handler</handler-name>
+ <handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+</handler-chains>
\ No newline at end of file
Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/handlers.xml
===================================================================
--- core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/handlers.xml 2010-09-04 15:19:56 UTC (rev 388)
+++ core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/handlers.xml 2010-09-04 16:38:26 UTC (rev 389)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
-
- <handler-chain>
- <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
- <handler>
- <handler-name>WSAddressing Handler</handler-name>
- <handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
- </handler>
- </handler-chain>
-
-</handler-chains>
\ No newline at end of file
13 years, 9 months
wise SVN: r388 - core/trunk/core.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 11:19:56 -0400 (Sat, 04 Sep 2010)
New Revision: 388
Modified:
core/trunk/core/pom.xml
Log:
Restoring proper logging
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-09-04 14:37:12 UTC (rev 387)
+++ core/trunk/core/pom.xml 2010-09-04 15:19:56 UTC (rev 388)
@@ -70,16 +70,17 @@
<groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
<exclusions>
-
<exclusion>
<groupId>wutka-dtdparser</groupId>
<artifactId>dtdparser121</artifactId>
</exclusion>
-
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
13 years, 9 months
wise SVN: r387 - in core/trunk: distribution and 1 other directory.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-04 10:37:12 -0400 (Sat, 04 Sep 2010)
New Revision: 387
Modified:
core/trunk/core-native/
core/trunk/distribution/
Log:
Setting svn:ignore props
Property changes on: core/trunk/core-native
___________________________________________________________________
Name: svn:ignore
+ target
.settings
.project
.classpath
Property changes on: core/trunk/distribution
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
13 years, 9 months